diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:10 +0100 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/plat-omap/devices.c | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 (diff) | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index bd9a06b3ee8..acd132c2964 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - +#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> @@ -24,7 +24,6 @@ #include <plat/tc.h> #include <plat/board.h> #include <plat/mmc.h> -#include <mach/gpio.h> #include <plat/menelaus.h> #include <plat/omap44xx.h> |