diff --git a/[refs] b/[refs]
index 17d46cf2dc90..7f0fe49f7b5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56422554d29e3761b095b3e27646e8ee03fae41a
+refs/heads/master: 9c291f0f835dc8349afc21d6311cb531140f6977
diff --git a/trunk/arch/arm/mach-mmp/aspenite.c b/trunk/arch/arm/mach-mmp/aspenite.c
index e8caf58e004c..a9efa5cadbe8 100644
--- a/trunk/arch/arm/mach-mmp/aspenite.c
+++ b/trunk/arch/arm/mach-mmp/aspenite.c
@@ -10,15 +10,27 @@
  */
 
 #include <linux/init.h>
+#include <linux/kernel.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/addr-map.h>
+#include <mach/mfp-pxa168.h>
+#include <mach/pxa168.h>
 
 #include "common.h"
 
+static unsigned long common_pin_config[] __initdata = {
+	/* UART1 */
+	GPIO107_UART1_RXD,
+	GPIO108_UART1_TXD,
+};
+
 static void __init common_init(void)
 {
+	mfp_config(ARRAY_AND_SIZE(common_pin_config));
+
+	pxa168_add_uart(1);
 }
 
 MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")