diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /arch/arm/mach-tegra/board-seaboard.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/arm/mach-tegra/board-seaboard.h')
| -rw-r--r-- | arch/arm/mach-tegra/board-seaboard.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-seaboard.h b/arch/arm/mach-tegra/board-seaboard.h index a098e3599731..d8415e1a8434 100644 --- a/arch/arm/mach-tegra/board-seaboard.h +++ b/arch/arm/mach-tegra/board-seaboard.h | |||
| @@ -17,6 +17,9 @@ | |||
| 17 | #ifndef _MACH_TEGRA_BOARD_SEABOARD_H | 17 | #ifndef _MACH_TEGRA_BOARD_SEABOARD_H |
| 18 | #define _MACH_TEGRA_BOARD_SEABOARD_H | 18 | #define _MACH_TEGRA_BOARD_SEABOARD_H |
| 19 | 19 | ||
| 20 | #define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5 | ||
| 21 | #define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1 | ||
| 22 | #define TEGRA_GPIO_SD2_POWER TEGRA_GPIO_PI6 | ||
| 20 | #define TEGRA_GPIO_LIDSWITCH TEGRA_GPIO_PC7 | 23 | #define TEGRA_GPIO_LIDSWITCH TEGRA_GPIO_PC7 |
| 21 | #define TEGRA_GPIO_USB1 TEGRA_GPIO_PD0 | 24 | #define TEGRA_GPIO_USB1 TEGRA_GPIO_PD0 |
| 22 | #define TEGRA_GPIO_POWERKEY TEGRA_GPIO_PV2 | 25 | #define TEGRA_GPIO_POWERKEY TEGRA_GPIO_PV2 |