Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

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

diff --git a/arch/arm/mach-omap2/powerdomains24xx.h b/arch/arm/mach-omap2/powerdomains24xx.h
index 652a01b729e900c61300b264e0c2bc17a717851e..775093add9b610385a6ab8ed55146fa1d9c7c4b0 100644 (file)
--- a/arch/arm/mach-omap2/powerdomains24xx.h
+++ b/arch/arm/mach-omap2/powerdomains24xx.h
@@ -30,7 +30,7 @@
 
 /* 24XX powerdomains and dependencies */
 
-#ifdef CONFIG_ARCH_OMAP24XX
+#ifdef CONFIG_ARCH_OMAP2
 
 /* Powerdomains */
 
@@ -82,7 +82,7 @@ static struct powerdomain core_24xx_pwrdm = {
        },
 };
 
-#endif    /* CONFIG_ARCH_OMAP24XX */
+#endif    /* CONFIG_ARCH_OMAP2 */