Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs

[deliverable/linux.git] / arch / metag / Kconfig

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index b06b41861aaca2fa517f657d92d4ad6a8e572b89..dcd94406030e3e9cebd2a15a01260c389d2d24a8 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -1,7 +1,3 @@
-config SYMBOL_PREFIX
-       string
-       default "_"
-
 config METAG
        def_bool y
        select EMBEDDED
@@ -28,6 +24,7 @@ config METAG
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select OF
@@ -55,9 +52,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
-config GENERIC_GPIO
-       def_bool n
-
 config NO_IOPORT
        def_bool y