aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/palmtx.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-07-30 10:46:12 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-30 10:46:12 +0100
commit5dbc80f69e131ecca42a5958b7785a57851c80d7 (patch)
tree8de1ab7fbea2a342dd023ea836c570c7a95ef764 /arch/arm/mach-pxa/palmtx.c
parent3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c (diff)
parent1d3e216f1d303878d7204de94dee251bc2702175 (diff)
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/palmtx.c')
-rw-r--r--arch/arm/mach-pxa/palmtx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 6c15d84bde5..83d02087958 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 = {
GPIO76_LCD_PCLK,
GPIO77_LCD_BIAS,
+ /* FFUART */
+ GPIO34_FFUART_RXD,
+ GPIO39_FFUART_TXD,
+
/* MISC. */
GPIO10_GPIO, /* hotsync button */
GPIO12_GPIO, /* power detect */