Merge remote-tracking branch 'pci/next'

[karo-tx-linux.git] / arch / c6x / Kconfig

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index f6a3648f5ec3c7030a8c4294be4e3bee54a25b6c..b4f77258caccf5fa9de1231e6ab4b1716ddc5ac6 100644 (file)
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -10,7 +10,6 @@ config C6X
        select GENERIC_IRQ_SHOW
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
-       select HAVE_GENERIC_HARDIRQS
        select HAVE_MEMBLOCK
        select SPARSE_IRQ
        select IRQ_DOMAIN
@@ -106,10 +105,6 @@ menu "Processor type and features"
 
 source "arch/c6x/platforms/Kconfig"
 
-config TMS320C6X_CACHES_ON
-       bool "L2 cache support"
-       default y
-
 config KERNEL_RAM_BASE_ADDRESS
        hex "Virtual address of memory base"
        default 0xe0000000 if SOC_TMS320C6455