From d1dd915a7b8af12fbf4514e0e2e266166ce00ed7 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Thu, 5 Nov 2009 18:09:01 +0000
Subject: [PATCH] --- yaml --- r: 172507 b: refs/heads/master c:
 b421950cdc7d0ac900414aa582c5e35aeab921c0 h: refs/heads/master i:   172505:
 fe0210faa570294793c0e466ebfd3d962d8bd2f9   172503:
 96e1e0201126b95ea3fbaa2594369f8041cde28a v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-kirkwood/ts219-setup.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c92231746cf4..b724fcb3714d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a131b90b8f9bbcf46edc3bdd5246a744ba0017
+refs/heads/master: b421950cdc7d0ac900414aa582c5e35aeab921c0
diff --git a/trunk/arch/arm/mach-kirkwood/ts219-setup.c b/trunk/arch/arm/mach-kirkwood/ts219-setup.c
index ec1a64f263d2..cb0f56dfd5ba 100644
--- a/trunk/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/trunk/arch/arm/mach-kirkwood/ts219-setup.c
@@ -152,6 +152,7 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
 	MPP14_UART1_RXD,	/* PIC controller */
 	MPP15_GPIO,		/* USB Copy button */
 	MPP16_GPIO,		/* Reset button */
+	MPP36_GPIO,		/* RAM: 0: 256 MB, 1: 512 MB */
 	0
 };