diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /drivers/video/omap/lcd_overo.c | |
parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video/omap/lcd_overo.c')
-rw-r--r-- | drivers/video/omap/lcd_overo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c index 564933ffac6e..b8fd5b2ec29c 100644 --- a/drivers/video/omap/lcd_overo.c +++ b/drivers/video/omap/lcd_overo.c @@ -23,7 +23,7 @@ #include <linux/platform_device.h> #include <linux/i2c/twl.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/mux.h> #include <asm/mach-types.h> |