diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 22:44:18 +0100 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /drivers/video/omap/lcd_apollon.c | |
| parent | Merge branch 'pxa/fixes' into next/fixes (diff) | |
| parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
| download | linux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz linux-43872fa788060eef91ae437957e0a5e39f1c56fd.zip | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video/omap/lcd_apollon.c')
| -rw-r--r-- | drivers/video/omap/lcd_apollon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c index 10459d8bd9a0..4b24f549f9b9 100644 --- a/drivers/video/omap/lcd_apollon.c +++ b/drivers/video/omap/lcd_apollon.c @@ -24,7 +24,7 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include "omapfb.h" |