3 files changed, 12 insertions, 15 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a0aeecc33c73..a421a7f24092 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -611,7 +611,7 @@ source "kernel/time/Kconfig"
 
 config SMP
         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && REALVIEW_MPCORE
+        depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -645,7 +645,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
         bool "Use local timer interrupts"
-        depends on SMP && REALVIEW_MPCORE
+        depends on SMP && REALVIEW_EB_ARM11MP
         default y
         help
           Enable support for local timers on SMP platforms, rather then the
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 35156ca39df7..39b3bb7f1020 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -7,24 +7,21 @@ config MACH_REALVIEW_EB
         help
           Include support for the ARM(R) RealView Emulation Baseboard platform.
 
-config REALVIEW_MPCORE
-        bool "Support MPcore tile"
+config REALVIEW_EB_ARM11MP
+        bool "Support ARM11MPCore tile"
         depends on MACH_REALVIEW_EB
         select CACHE_L2X0
         help
-          Enable support for the MPCore tile on the Realview platform.
-          Since there are device address and interrupt differences, a
-          kernel built with this option enabled is not compatible with
-          other tiles.
+          Enable support for the ARM11MPCore tile on the Realview platform.
 
-config REALVIEW_MPCORE_REVB
-        bool "Support MPcore RevB tile"
-        depends on REALVIEW_MPCORE
+config REALVIEW_EB_ARM11MP_REVB
+        bool "Support ARM11MPCore RevB tile"
+        depends on REALVIEW_EB_ARM11MP
         default n
         help
-          Enable support for the MPCore RevB tile on the Realview platform.
-          Since there are device address differences, a
+          Enable support for the ARM11MPCore RevB tile on the Realview
+          platform. Since there are device address differences, a
           kernel built with this option enabled is not compatible with
-          other tiles.
+          other revisions of the ARM11MPCore tile.
 
 endmenu
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 8ded2cc79cca..60d9eb810246 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -261,7 +261,7 @@ static void __init gic_init_irq(void)
                 gic_dist_init(0, __io_address(REALVIEW_EB11MP_GIC_DIST_BASE), 29);
                 gic_cpu_init(0, gic_cpu_base_addr);
 
-#ifndef CONFIG_REALVIEW_MPCORE_REVB
+#ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB
                 /* board GIC, secondary */
                 gic_dist_init(1, __io_address(REALVIEW_GIC_DIST_BASE), 64);
                 gic_cpu_init(1, __io_address(REALVIEW_GIC_CPU_BASE));