diff options
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/mvebu_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1b4821bc5c7a..4863cdc3fb95 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -56,6 +56,7 @@ CONFIG_ARCH_VEXPRESS_CA9X4=y | |||
56 | CONFIG_ARCH_VIRT=y | 56 | CONFIG_ARCH_VIRT=y |
57 | CONFIG_ARCH_WM8850=y | 57 | CONFIG_ARCH_WM8850=y |
58 | CONFIG_ARCH_ZYNQ=y | 58 | CONFIG_ARCH_ZYNQ=y |
59 | CONFIG_NEON=y | ||
59 | CONFIG_TRUSTED_FOUNDATIONS=y | 60 | CONFIG_TRUSTED_FOUNDATIONS=y |
60 | CONFIG_PCI=y | 61 | CONFIG_PCI=y |
61 | CONFIG_PCI_MSI=y | 62 | CONFIG_PCI_MSI=y |
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 0f4511d2849f..2ffba3d7b5a5 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig | |||
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y | |||
11 | CONFIG_ARCH_MVEBU=y | 11 | CONFIG_ARCH_MVEBU=y |
12 | CONFIG_MACH_ARMADA_370=y | 12 | CONFIG_MACH_ARMADA_370=y |
13 | CONFIG_MACH_ARMADA_XP=y | 13 | CONFIG_MACH_ARMADA_XP=y |
14 | CONFIG_NEON=y | ||
14 | # CONFIG_CACHE_L2X0 is not set | 15 | # CONFIG_CACHE_L2X0 is not set |
15 | # CONFIG_SWP_EMULATE is not set | 16 | # CONFIG_SWP_EMULATE is not set |
16 | CONFIG_PCI=y | 17 | CONFIG_PCI=y |
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 485513cb98c4..b24a082b355b 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
@@ -39,7 +39,6 @@ config MACH_ARMADA_375 | |||
39 | select ARMADA_375_CLK | 39 | select ARMADA_375_CLK |
40 | select CPU_V7 | 40 | select CPU_V7 |
41 | select MACH_MVEBU_V7 | 41 | select MACH_MVEBU_V7 |
42 | select NEON | ||
43 | select PINCTRL_ARMADA_375 | 42 | select PINCTRL_ARMADA_375 |
44 | help | 43 | help |
45 | Say 'Y' here if you want your kernel to support boards based | 44 | Say 'Y' here if you want your kernel to support boards based |
@@ -53,7 +52,6 @@ config MACH_ARMADA_38X | |||
53 | select ARMADA_38X_CLK | 52 | select ARMADA_38X_CLK |
54 | select CPU_V7 | 53 | select CPU_V7 |
55 | select MACH_MVEBU_V7 | 54 | select MACH_MVEBU_V7 |
56 | select NEON | ||
57 | select PINCTRL_ARMADA_38X | 55 | select PINCTRL_ARMADA_38X |
58 | help | 56 | help |
59 | Say 'Y' here if you want your kernel to support boards based | 57 | Say 'Y' here if you want your kernel to support boards based |