Merge tag 'locks-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / arch / arm / mach-bcm / Kconfig

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 5d2925e2ce1ff8b99ec219fbcc1c392d28e01835..c2f3b0d216a4d6e0f92473b1faa9dad107822021 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -23,7 +23,7 @@ config ARCH_BCM_IPROC
        help
          This enables support for systems based on Broadcom IPROC architected SoCs.
          The IPROC complex contains one or more ARM CPUs along with common
-         core periperals. Application specific SoCs are created by adding a
+         core peripherals. Application specific SoCs are created by adding a
          uArchitecture containing peripherals outside of the IPROC complex.
          Currently supported SoCs are Cygnus.
 
@@ -37,6 +37,15 @@ config ARCH_BCM_CYGNUS
          BCM11300, BCM11320, BCM11350, BCM11360,
          BCM58300, BCM58302, BCM58303, BCM58305.
 
+config ARCH_BCM_HR2
+       bool "Broadcom Hurricane 2 SoC support"
+       depends on ARCH_MULTI_V7
+       select ARCH_BCM_IPROC
+       help
+         Enable support for the Hurricane 2 family,
+         which includes the following variants:
+         BCM53342, BCM53343, BCM53344, BCM53346.
+
 config ARCH_BCM_NSP
        bool "Broadcom Northstar Plus SoC Support"
        depends on ARCH_MULTI_V7
@@ -69,8 +78,8 @@ config ARCH_BCM_5301X
          Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.
 
          This is a network SoC line mostly used in home routers and
-         wifi access points, it's internal name is Northstar.
-         This inclused the following SoC: BCM53010, BCM53011, BCM53012,
+         wifi access points, its internal name is Northstar.
+         This includes the following SoC: BCM53010, BCM53011, BCM53012,
          BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707,
          BCM4708 and BCM4709.