Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-realview / Kconfig

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 39b3bb7f1020b35725ead58c7d5e051ce8ce0170..5ccde7cf39e868ce129c4f4fc204903d1f72f6d8 100644 (file)
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -10,7 +10,6 @@ config MACH_REALVIEW_EB
 config REALVIEW_EB_ARM11MP
        bool "Support ARM11MPCore tile"
        depends on MACH_REALVIEW_EB
 config REALVIEW_EB_ARM11MP
        bool "Support ARM11MPCore tile"
        depends on MACH_REALVIEW_EB

-       select CACHE_L2X0

        help
          Enable support for the ARM11MPCore tile on the Realview platform.
 
        help
          Enable support for the ARM11MPCore tile on the Realview platform.
 


@@ -24,4 +23,18 @@ config REALVIEW_EB_ARM11MP_REVB
          kernel built with this option enabled is not compatible with
          other revisions of the ARM11MPCore tile.
 
          kernel built with this option enabled is not compatible with
          other revisions of the ARM11MPCore tile.
 

+config MACH_REALVIEW_PB11MP
+       bool "Support RealView/PB11MPCore platform"
+       select ARM_GIC
+       help
+         Include support for the ARM(R) RealView MPCore Platform Baseboard.
+         PB11MPCore is a platform with an on-board ARM11MPCore and has
+         support for PCI-E and Compact Flash.
+
+config MACH_REALVIEW_PB1176
+       bool "Support RealView/PB1176 platform"
+       select ARM_GIC
+       help
+         Include support for the ARM(R) RealView ARM1176 Platform Baseboard.
+

 endmenu
 endmenu