Merge branch 'for-linus-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 10c15b8853ae5a56c2d4a200c80ceef956b690eb..ec9711d068b7f9ab9a4f721d46a0db53b4c62414 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -12,8 +12,7 @@ config UML
        select HAVE_UID16
        select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_DEBUG_KMEMLEAK
-       select HAVE_MEMBLOCK
-       select NO_BOOTMEM
+       select HAVE_DEBUG_BUGVERBOSE
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select GENERIC_CLOCKEVENTS
@@ -33,12 +32,6 @@ config ISA
 config SBUS
        bool
 
-config PCI
-       bool
-
-config PCMCIA
-       bool
-
 config TRACE_IRQFLAGS_SUPPORT
        bool
        default y