diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
commit | 5dbc80f69e131ecca42a5958b7785a57851c80d7 (patch) | |
tree | 8de1ab7fbea2a342dd023ea836c570c7a95ef764 /arch/arm/mach-pxa/palmld.c | |
parent | 3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c (diff) | |
parent | 1d3e216f1d303878d7204de94dee251bc2702175 (diff) | |
download | op-kernel-dev-5dbc80f69e131ecca42a5958b7785a57851c80d7.zip op-kernel-dev-5dbc80f69e131ecca42a5958b7785a57851c80d7.tar.gz |
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/palmld.c')
-rw-r--r-- | arch/arm/mach-pxa/palmld.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index ed70f28..169fcc1 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c @@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { GPIO38_GPIO, /* wifi ready */ GPIO81_GPIO, /* wifi reset */ + /* FFUART */ + GPIO34_FFUART_RXD, + GPIO39_FFUART_TXD, + /* HDD */ GPIO98_GPIO, /* HDD reset */ GPIO115_GPIO, /* HDD power */ |