---

yaml --- r: 333289 b: refs/heads/master c: e0347c5 h: refs/heads/master i: 333287: 3906f53 v: v3
git-mirror · Oct 4, 2012 · e5ebac2 · e5ebac2
1 parent 7548ffd
commit e5ebac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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>