diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 18:46:26 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 18:46:26 +0400 |
| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /drivers/video/omap/lcd_ldp.c | |
| parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
| download | linux-335332770c68649ffeaf5dc2b58d9cd40041e295.tar.xz | |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'drivers/video/omap/lcd_ldp.c')
| -rw-r--r-- | drivers/video/omap/lcd_ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c index 0f5952cae85e..062466402c0e 100644 --- a/drivers/video/omap/lcd_ldp.c +++ b/drivers/video/omap/lcd_ldp.c @@ -26,7 +26,7 @@ #include <linux/delay.h> #include <linux/i2c/twl.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/mux.h> #include <asm/mach-types.h> |