Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / prcm-common.h

diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index e5f0503a68b09e5a2eff32e1a01350a33e32c91b..72df97482cc04f7eb95f8f5acfe87aa2372081e0 100644 (file)
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -109,6 +109,8 @@
 #define OMAP2430_EN_MDM_INTC_MASK                      (1 << 11)
 #define OMAP2430_EN_USBHS_SHIFT                                6
 #define OMAP2430_EN_USBHS_MASK                         (1 << 6)
+#define OMAP24XX_EN_GPMC_SHIFT                         1
+#define OMAP24XX_EN_GPMC_MASK                          (1 << 1)
 
 /* CM_IDLEST1_CORE, PM_WKST1_CORE shared bits */
 #define OMAP2420_ST_MMC_SHIFT                          26