diff options
author | Yoichi Yuasa <yuasa@linux-mips.org> | 2012-07-19 03:11:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-07-19 05:23:43 -0400 |
commit | 7ee91de45a9a841ac59d597901e984b859b31bbe (patch) | |
tree | 61aa991116a17a2c703a513a77b4aff3b422866e | |
parent | b96b62db8cec46693e192f31c2c14147212530fc (diff) |
MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3883/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/cavium-octeon/Kconfig | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 09ab87ee6fef..5eb8c932fe53 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1423,6 +1423,7 @@ config CPU_SB1 | |||
1423 | config CPU_CAVIUM_OCTEON | 1423 | config CPU_CAVIUM_OCTEON |
1424 | bool "Cavium Octeon processor" | 1424 | bool "Cavium Octeon processor" |
1425 | depends on SYS_HAS_CPU_CAVIUM_OCTEON | 1425 | depends on SYS_HAS_CPU_CAVIUM_OCTEON |
1426 | select ARCH_SPARSEMEM_ENABLE | ||
1426 | select CPU_HAS_PREFETCH | 1427 | select CPU_HAS_PREFETCH |
1427 | select CPU_SUPPORTS_64BIT_KERNEL | 1428 | select CPU_SUPPORTS_64BIT_KERNEL |
1428 | select SYS_SUPPORTS_SMP | 1429 | select SYS_SUPPORTS_SMP |
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig index f9e275a50d98..2f4f6d5e05b6 100644 --- a/arch/mips/cavium-octeon/Kconfig +++ b/arch/mips/cavium-octeon/Kconfig | |||
@@ -82,10 +82,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY | |||
82 | help | 82 | help |
83 | Lock the kernel's implementation of memcpy() into L2. | 83 | Lock the kernel's implementation of memcpy() into L2. |
84 | 84 | ||
85 | config ARCH_SPARSEMEM_ENABLE | ||
86 | def_bool y | ||
87 | select SPARSEMEM_STATIC | ||
88 | |||
89 | config IOMMU_HELPER | 85 | config IOMMU_HELPER |
90 | bool | 86 | bool |
91 | 87 | ||