diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/mach-tegra/board-trimslice-pinmux.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/mach-tegra/board-trimslice-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c index 47c596cdbf32..bcb1916e68b9 100644 --- a/arch/arm/mach-tegra/board-trimslice-pinmux.c +++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c | |||
| @@ -13,12 +13,11 @@ | |||
| 13 | * GNU General Public License for more details. | 13 | * GNU General Public License for more details. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | #include <linux/gpio.h> | |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | 19 | ||
| 20 | #include <mach/pinmux.h> | 20 | #include <mach/pinmux.h> |
| 21 | #include <mach/gpio.h> | ||
| 22 | 21 | ||
| 23 | #include "gpio-names.h" | 22 | #include "gpio-names.h" |
| 24 | #include "board-trimslice.h" | 23 | #include "board-trimslice.h" |