Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[pandora-kernel.git] / arch / metag / Kconfig

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 30adc78..afc8973 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -8,7 +8,6 @@ config METAG
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_SHOW
-       select GENERIC_SIGALTSTACK
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_64BIT_ALIGNED_ACCESS
        select HAVE_ARCH_TRACEHOOK
@@ -19,7 +18,6 @@ config METAG
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_GENERIC_HARDIRQS
-       select HAVE_IRQ_WORK
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZO
@@ -35,9 +33,6 @@ config METAG
        select OF_EARLY_FLATTREE
        select SPARSE_IRQ
 
-config ARCH_NO_VIRT_TO_BUS
-       def_bool y
-
 config STACKTRACE_SUPPORT
        def_bool y