diff --git a/[refs] b/[refs]
index b477360de102..446e1aa98a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c9127da74be59464d7781c5bb64228032891724
+refs/heads/master: 21da67a23835db95a15abbe693ed6e0cdad58458
diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/trunk/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index b1fcd10ab6c6..bcf3fb2c4b3a 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
@@ -193,10 +193,8 @@
 #define CKEN_MINI_IM	48	/* < Mini-IM */
 #define CKEN_MINI_LCD	49	/* < Mini LCD */
 
-#if defined(CONFIG_CPU_PXA310)
 #define CKEN_MMC3	5	/* < MMC3 Clock Enable */
 #define CKEN_MVED	43	/* < MVED clock enable */
-#endif
 
 /* Note: GCU clock enable bit differs on PXA300/PXA310 and PXA320 */
 #define PXA300_CKEN_GRAPHICS	42	/* Graphics controller clock enable */