diff options
| author | Olof Johansson <olof@lixom.net> | 2011-03-17 02:08:22 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-03-17 02:08:22 -0400 |
| commit | 2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2 (patch) | |
| tree | 16deb170fef81c11aff65d5beda92e45533ec96c /arch/arm/mach-tegra/board-trimslice.h | |
| parent | 6f168f2fa60f87e85e0df25e87e2372f22f5eb7c (diff) | |
| parent | f02726a77960194995dac9fd218ec10b4de76cd6 (diff) | |
Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux-tegra into boards-for-next
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice.h')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.h b/arch/arm/mach-tegra/board-trimslice.h index 16ec0f0d3bb1..e8ef6291c6f1 100644 --- a/arch/arm/mach-tegra/board-trimslice.h +++ b/arch/arm/mach-tegra/board-trimslice.h | |||
| @@ -17,6 +17,9 @@ | |||
| 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 | #define TRIMSLICE_GPIO_SD4_CD TEGRA_GPIO_PP1 /* mmc4 cd */ | ||
| 21 | #define TRIMSLICE_GPIO_SD4_WP TEGRA_GPIO_PP2 /* mmc4 wp */ | ||
| 22 | |||
| 20 | void trimslice_pinmux_init(void); | 23 | void trimslice_pinmux_init(void); |
| 21 | 24 | ||
| 22 | #endif | 25 | #endif |