diff options
Diffstat (limited to 'arch/arm/mach-omap2/soc.h')
| -rw-r--r-- | arch/arm/mach-omap2/soc.h | 8 | 
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 070096496e2..f31d90774de 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -435,9 +435,7 @@ extern u32 omap_features;  #define OMAP3_HAS_IO_WAKEUP		BIT(6)  #define OMAP3_HAS_SDRC			BIT(7)  #define OMAP3_HAS_IO_CHAIN_CTRL		BIT(8) -#define OMAP4_HAS_MPU_1GHZ		BIT(9) -#define OMAP4_HAS_MPU_1_2GHZ		BIT(10) -#define OMAP4_HAS_MPU_1_5GHZ		BIT(11) +#define OMAP4_HAS_PERF_SILICON		BIT(9)  #define OMAP3_HAS_FEATURE(feat,flag)			\ @@ -465,9 +463,7 @@ static inline unsigned int omap4_has_ ##feat(void)	\  	return omap_features & OMAP4_HAS_ ##flag;	\  }							\ -OMAP4_HAS_FEATURE(mpu_1ghz, MPU_1GHZ) -OMAP4_HAS_FEATURE(mpu_1_2ghz, MPU_1_2GHZ) -OMAP4_HAS_FEATURE(mpu_1_5ghz, MPU_1_5GHZ) +OMAP4_HAS_FEATURE(perf_silicon, PERF_SILICON)  #endif	/* __ASSEMBLY__ */  |