diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-sa1100/generic.c | |
| parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
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 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index e21f3470eece..5fa5ae1f39e1 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/gpio.h> | ||
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| @@ -24,7 +25,6 @@ | |||
| 24 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
| 25 | #include <asm/mach/flash.h> | 26 | #include <asm/mach/flash.h> |
| 26 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
| 27 | #include <asm/gpio.h> | ||
| 28 | 28 | ||
| 29 | #include "generic.h" | 29 | #include "generic.h" |
| 30 | 30 | ||