Merge commit 'v2.6.37-rc1' into for-2.6.37

[~andy/linux] / drivers / i2c / busses / i2c-simtec.c

diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 78b06107342cde80bdb33c4b25ecdc97dfebb38e..2fc08fbf67a223d6e7bfb26a0cf0d50ff40f821d 100644 (file)
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -24,12 +24,11 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/io.h>
-
 struct simtec_i2c_data {
        struct resource         *ioarea;
        void __iomem            *reg;