Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

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

diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 55a71370c79b1fe780b3d0324db544989195f1c3..437586611d4a18819f110698d7618f7dde9471c3 100644 (file)
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -61,7 +61,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static int blacklist[] = {
        PCI_DEVICE_ID_SI_540,