diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-omap2/board-overo.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index dff5528fbfb5..e26af837510b 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | 51 | ||
| 52 | #define OVERO_GPIO_BT_XGATE 15 | 52 | #define OVERO_GPIO_BT_XGATE 15 |
| 53 | #define OVERO_GPIO_W2W_NRESET 16 | 53 | #define OVERO_GPIO_W2W_NRESET 16 |
| 54 | #define OVERO_GPIO_PENDOWN 114 | ||
| 54 | #define OVERO_GPIO_BT_NRESET 164 | 55 | #define OVERO_GPIO_BT_NRESET 164 |
| 55 | #define OVERO_GPIO_USBH_CPEN 168 | 56 | #define OVERO_GPIO_USBH_CPEN 168 |
| 56 | #define OVERO_GPIO_USBH_NRESET 183 | 57 | #define OVERO_GPIO_USBH_NRESET 183 |