diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-tegra/board-trimslice.h | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
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-tegra/board-trimslice.h')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.h b/arch/arm/mach-tegra/board-trimslice.h index 7a7dee86b4da..50f128d87779 100644 --- a/arch/arm/mach-tegra/board-trimslice.h +++ b/arch/arm/mach-tegra/board-trimslice.h | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | #ifndef _MACH_TEGRA_BOARD_TRIMSLICE_H | 17 | #ifndef _MACH_TEGRA_BOARD_TRIMSLICE_H |
| 18 | #define _MACH_TEGRA_BOARD_TRIMSLICE_H | 18 | #define _MACH_TEGRA_BOARD_TRIMSLICE_H |
| 19 | 19 | ||
| 20 | #include <mach/gpio-tegra.h> | ||
| 21 | |||
| 20 | #define TRIMSLICE_GPIO_SD4_CD TEGRA_GPIO_PP1 /* mmc4 cd */ | 22 | #define TRIMSLICE_GPIO_SD4_CD TEGRA_GPIO_PP1 /* mmc4 cd */ |
| 21 | #define TRIMSLICE_GPIO_SD4_WP TEGRA_GPIO_PP2 /* mmc4 wp */ | 23 | #define TRIMSLICE_GPIO_SD4_WP TEGRA_GPIO_PP2 /* mmc4 wp */ |
| 22 | 24 | ||