linux-mips
[Top] [All Lists]

[PATCH] MIPS: Only include arch/mips/cavium-octeon/Kconfig if CPU_CAVIUM

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] MIPS: Only include arch/mips/cavium-octeon/Kconfig if CPU_CAVIUM_OCTEON
From: David Daney <ddaney@caviumnetworks.com>
Date: Thu, 17 Feb 2011 10:02:03 -0800
Cc: David Daney <ddaney@caviumnetworks.com>, Antony Pavlov <antonynpavlov@gmail.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Instead of making each Octeon specific option depend on
CPU_CAVIUM_OCTEON, just quit including cavium-octeon/Kconfig if it is
not applicable.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/Kconfig               |    4 ++++
 arch/mips/cavium-octeon/Kconfig |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bd7b64d..b0a1cb3 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -748,7 +748,11 @@ source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
 source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
+
+if CPU_CAVIUM_OCTEON
 source "arch/mips/cavium-octeon/Kconfig"
+endif
+
 source "arch/mips/loongson/Kconfig"
 
 endmenu
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index caae228..3dab0ec 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -1,6 +1,5 @@
 config CAVIUM_OCTEON_SPECIFIC_OPTIONS
        bool "Enable Octeon specific options"
-       depends on CPU_CAVIUM_OCTEON
        default "y"
 
 config CAVIUM_CN63XXP1
@@ -93,7 +92,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        select SPARSEMEM_STATIC
-       depends on CPU_CAVIUM_OCTEON
 
 config CAVIUM_OCTEON_HELPER
        def_bool y
@@ -107,6 +105,5 @@ config NEED_SG_DMA_LENGTH
 
 config SWIOTLB
        def_bool y
-       depends on CPU_CAVIUM_OCTEON
        select IOMMU_HELPER
        select NEED_SG_DMA_LENGTH
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>