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-tegra/board-trimslice.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-tegra/board-trimslice.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 91875b975563..c3aff9fdffd3 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <mach/iomap.h> | 33 | #include <mach/iomap.h> |
| 34 | #include <mach/sdhci.h> | 34 | #include <mach/sdhci.h> |
| 35 | #include <mach/gpio.h> | ||
| 36 | 35 | ||
| 37 | #include "board.h" | 36 | #include "board.h" |
| 38 | #include "clock.h" | 37 | #include "clock.h" |