diff options
| author | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /arch/arm/mach-pxa/palmtx.c | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-pxa/palmtx.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 6c15d84bde53..83d020879581 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
| @@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
| 127 | GPIO76_LCD_PCLK, | 127 | GPIO76_LCD_PCLK, |
| 128 | GPIO77_LCD_BIAS, | 128 | GPIO77_LCD_BIAS, |
| 129 | 129 | ||
| 130 | /* FFUART */ | ||
| 131 | GPIO34_FFUART_RXD, | ||
| 132 | GPIO39_FFUART_TXD, | ||
| 133 | |||
| 130 | /* MISC. */ | 134 | /* MISC. */ |
| 131 | GPIO10_GPIO, /* hotsync button */ | 135 | GPIO10_GPIO, /* hotsync button */ |
| 132 | GPIO12_GPIO, /* power detect */ | 136 | GPIO12_GPIO, /* power detect */ |