Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/i2c/chips/lp5521.c b/drivers/i2c/chips/lp5521.c
index 32664c0e1842f658951d609ffda2b25275d61ff5..c0862d9f2690f0f0daa38f21659aed7011dff175 100644 (file)
--- a/drivers/i2c/chips/lp5521.c
+++ b/drivers/i2c/chips/lp5521.c
@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #define LP5521_DRIVER_NAME             "lp5521"