Merge branch 'topic/soundcore-preclaim' into for-linus

[pandora-kernel.git] / arch / arm / mach-pxa / palmld.c

diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index ed70f28..169fcc1 100644 (file)
--- 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 */