Merge branch 'topic/asoc' into for-linus

[mv-sheeva.git] / drivers / i2c / busses / i2c-ocores.c

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index b4ed4ca802ed97d9f829adcc60b850548582f50f..0070371b29f3c0e6f05f329ca0233cc8096a1c55 100644 (file)
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -19,7 +19,7 @@
 #include <linux/wait.h>
 #include <linux/i2c-ocores.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 struct ocores_i2c {
        void __iomem *base;