From 799f599cd01ffb63c9ab487398501c33b567874c Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Sat, 22 May 2010 00:29:35 +0200
Subject: [PATCH] --- yaml --- r: 208601 b: refs/heads/master c:
 12d94208dbeed61ea5e00f7ba6b0b29bf960e5a9 h: refs/heads/master i:   208599:
 897220939f498aaa8592676248a8e7597f6397a8 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-pxa/colibri-pxa270.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bb6961ae5a25..ed4cb395d7ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d01b8d64949dd39ffe2cbe8068b82fb83f82f43c
+refs/heads/master: 12d94208dbeed61ea5e00f7ba6b0b29bf960e5a9
diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa270.c b/trunk/arch/arm/mach-pxa/colibri-pxa270.c
index cbaf0196c747..3d19a6a25b4b 100644
--- a/trunk/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/trunk/arch/arm/mach-pxa/colibri-pxa270.c
@@ -54,6 +54,10 @@ static mfp_cfg_t colibri_pxa270_pin_config[] __initdata = {
 	GPIO111_MMC_DAT_3,
 	GPIO112_MMC_CMD,
 	GPIO0_GPIO,	/* SD detect */
+
+	/* FFUART */
+	GPIO39_FFUART_TXD,
+	GPIO34_FFUART_RXD,
 };
 
 /******************************************************************************