Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[linux-2.6-block.git] / drivers / char / ds1620.c

diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 0fae5296e311cc819fc071356c77c07d8de74d93..eb53cbadb68f8ca348f0de5ad3769341e8b5590a 100644 (file)
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -13,7 +13,7 @@
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/therm.h>
 
 #ifdef CONFIG_PROC_FS