Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / tsl2563.c

diff --git a/drivers/i2c/chips/tsl2563.c b/drivers/i2c/chips/tsl2563.c
index ddca5e30d041f248f143dcbbde89d51ccc2a91d7..e05b88007b1d695fe0e3425165361249403a1992 100644 (file)
--- a/drivers/i2c/chips/tsl2563.c
+++ b/drivers/i2c/chips/tsl2563.c
@@ -31,7 +31,7 @@
 #include <linux/pm.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #define DRIVER_NAME  "tsl2563"