Merge branch 'devel'

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa3xx-regs.h

diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index b1fcd10ab6c6bfeeba709a4efae8f1d878b194cc..bcf3fb2c4b3a1f686fa9ec1e6a7d107d38518c5a 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
+++ b/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 */