Merge commit 'v2.6.31-rc8' into next

[mirror_ubuntu-jammy-kernel.git] / arch / arm / mach-pxa / palmt5.c

diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index aae64a12a734e2ce82d2e91cca54d27d0b1cd345..33f726ff55e5ec30784400847746129826bea3be 100644 (file)
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = {
        /* PWM */
        GPIO16_PWM0_OUT,
 
+       /* FFUART */
+       GPIO34_FFUART_RXD,
+       GPIO39_FFUART_TXD,
+
        /* MISC */
        GPIO10_GPIO,    /* hotsync button */
        GPIO90_GPIO,    /* power detect */