diff --git a/[refs] b/[refs]
index b58a89610c80..9b93333bc45b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e181191acdfde5b1f9690c74a2459dd0a3331c62
+refs/heads/master: 7a97010eb4f47c9d2d66bfb838a8638a8d02d9ef
diff --git a/trunk/arch/arm/mach-pxa/magician.c b/trunk/arch/arm/mach-pxa/magician.c
index 6de2c13bd65b..2dc14c361c14 100644
--- a/trunk/arch/arm/mach-pxa/magician.c
+++ b/trunk/arch/arm/mach-pxa/magician.c
@@ -44,7 +44,7 @@
 #include "devices.h"
 #include "generic.h"
 
-static unsigned long magician_pin_config[] = {
+static unsigned long magician_pin_config[] __initdata = {
 
 	/* SDRAM and Static Memory I/O Signals */
 	GPIO20_nSDCS_2,