From: Yoichi Yuasa Date: Thu, 19 Jul 2012 07:11:15 +0000 (+0200) Subject: MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7ee91de45a9a841ac59d597901e984b859b31bbe;p=openwrt%2Fstaging%2Fblogic.git MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig. Signed-off-by: Yoichi Yuasa Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3883/ Signed-off-by: Ralf Baechle --- 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 config CPU_CAVIUM_OCTEON bool "Cavium Octeon processor" depends on SYS_HAS_CPU_CAVIUM_OCTEON + select ARCH_SPARSEMEM_ENABLE select CPU_HAS_PREFETCH select CPU_SUPPORTS_64BIT_KERNEL 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 help Lock the kernel's implementation of memcpy() into L2. -config ARCH_SPARSEMEM_ENABLE - def_bool y - select SPARSEMEM_STATIC - config IOMMU_HELPER bool