Merge tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd

[~andy/linux] / arch / mips / cavium-octeon / Platform

diff --git a/arch/mips/cavium-octeon/Platform b/arch/mips/cavium-octeon/Platform
index 1e43ccf1a792f84afa76354bf0c6f2c2c893b7b1..8a301cb12d68cf7d36b0638df1c480e8df0558ab 100644 (file)
--- a/arch/mips/cavium-octeon/Platform
+++ b/arch/mips/cavium-octeon/Platform
@@ -1,11 +1,11 @@
 #
 # Cavium Octeon
 #
-platform-$(CONFIG_CPU_CAVIUM_OCTEON)   += cavium-octeon/
-cflags-$(CONFIG_CPU_CAVIUM_OCTEON)     +=                              \
+platform-$(CONFIG_CAVIUM_OCTEON_SOC)   += cavium-octeon/
+cflags-$(CONFIG_CAVIUM_OCTEON_SOC)     +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon
 ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
-load-$(CONFIG_CPU_CAVIUM_OCTEON)       += 0xffffffff84100000
+load-$(CONFIG_CAVIUM_OCTEON_SOC)       += 0xffffffff84100000
 else
-load-$(CONFIG_CPU_CAVIUM_OCTEON)       += 0xffffffff81100000
+load-$(CONFIG_CAVIUM_OCTEON_SOC)       += 0xffffffff81100000
 endif