diff options
Diffstat (limited to 'arch/arm/mach-berlin/Kconfig')
| -rw-r--r-- | arch/arm/mach-berlin/Kconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 101e0f356730..2631cfc5ab0d 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | config ARCH_BERLIN | 1 | menuconfig ARCH_BERLIN |
| 2 | bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 | 2 | bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 |
| 3 | select ARCH_REQUIRE_GPIOLIB | 3 | select ARCH_REQUIRE_GPIOLIB |
| 4 | select ARM_GIC | 4 | select ARM_GIC |
| @@ -9,8 +9,6 @@ config ARCH_BERLIN | |||
| 9 | 9 | ||
| 10 | if ARCH_BERLIN | 10 | if ARCH_BERLIN |
| 11 | 11 | ||
| 12 | menu "Marvell Berlin SoC variants" | ||
| 13 | |||
| 14 | config MACH_BERLIN_BG2 | 12 | config MACH_BERLIN_BG2 |
| 15 | bool "Marvell Armada 1500 (BG2)" | 13 | bool "Marvell Armada 1500 (BG2)" |
| 16 | select CACHE_L2X0 | 14 | select CACHE_L2X0 |
| @@ -30,6 +28,4 @@ config MACH_BERLIN_BG2Q | |||
| 30 | select HAVE_ARM_TWD if SMP | 28 | select HAVE_ARM_TWD if SMP |
| 31 | select PINCTRL_BERLIN_BG2Q | 29 | select PINCTRL_BERLIN_BG2Q |
| 32 | 30 | ||
| 33 | endmenu | ||
| 34 | |||
| 35 | endif | 31 | endif |
