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 /arch/arm/mach-at91/board-cpuat91.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 'arch/arm/mach-at91/board-cpuat91.c')
| -rw-r--r-- | arch/arm/mach-at91/board-cpuat91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 2d919f5a4f57..d35e65b08ccd 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c @@ -19,6 +19,7 @@ */ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h> @@ -36,7 +37,6 @@ #include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91rm9200_mc.h> #include <mach/cpu.h> |