From e5ebac27cc763bc198e89fe1944d1283e531ef2e Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:34:49 +0000
Subject: [PATCH] --- yaml --- r: 333289 b: refs/heads/master c:
 e0347c52384d494618299c64ad8ba68665044919 h: refs/heads/master i:   333287:
 3906f53f8818f06b45376f32a746919d6356cb22 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-pxa/cm-x2xx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4e1cb2a05441..6f62a085c571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 066258f4293128bb489e42790637dd6d9b7ff206
+refs/heads/master: e0347c52384d494618299c64ad8ba68665044919
diff --git a/trunk/arch/arm/mach-pxa/cm-x2xx.c b/trunk/arch/arm/mach-pxa/cm-x2xx.c
index 8fa4ad27edf3..ae5e74a34d5a 100644
--- a/trunk/arch/arm/mach-pxa/cm-x2xx.c
+++ b/trunk/arch/arm/mach-pxa/cm-x2xx.c
@@ -22,6 +22,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/pxa25x.h>
+#undef GPIO24_SSP1_SFRM
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/pxafb.h>