Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep'

[karo-tx-linux.git] / arch / um / Kconfig.common

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index bceee6623b00134023918cd5b62ec6144e3c66eb..21ca44c4f6d58b1a845dfba592cbc704649bc1e3 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -1,12 +1,6 @@
-config DEFCONFIG_LIST
-       string
-       option defconfig_list
-       default "arch/$ARCH/defconfig"
-
 config UML
        bool
        default y
-       select HAVE_GENERIC_HARDIRQS
        select HAVE_UID16
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES