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 c37c7dfee8be00905bdd6389689f6bd2825e006e..ec9711d068b7f9ab9a4f721d46a0db53b4c62414 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -32,12 +32,6 @@ config ISA
 config SBUS
        bool
 
 config SBUS
        bool
 

-config PCI
-       bool
-
-config PCMCIA
-       bool
-

 config TRACE_IRQFLAGS_SUPPORT
        bool
        default y
 config TRACE_IRQFLAGS_SUPPORT
        bool
        default y