[S390] irq change improvements.

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

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 5982fe2753e0286382aa07ba35ba831b98cb2285..d75307589d74c144f39d713fea8749242e36e29f 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -22,6 +22,9 @@ config SBUS
 config PCI
        bool
 
+config PCMCIA
+       bool
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -54,20 +57,6 @@ config STATIC_LINK
        chroot, and you disable CONFIG_MODE_TT, you probably want to say Y
        here.
 
-config HOST_2G_2G
-       bool "2G/2G host address space split"
-       default n
-       depends on MODE_TT
-       help
-       This is needed when the host on which you run has a 2G/2G memory
-       split, instead of the customary 3G/1G.
-
-       Note that to enable such a host
-       configuration, which makes sense only in some cases, you need special
-       host patches.
-
-       So, if you do not know what to do here, say 'N'.
-
 config KERNEL_HALF_GIGS
        int "Kernel address space size (in .5G units)"
        default "1"
@@ -268,7 +257,7 @@ config UML_REAL_TIME_CLOCK
        UML and spend long times with UML stopped at a breakpoint.  In this
        case, when UML is restarted, it will call the timer enough times to make
        up for the time spent at the breakpoint.  This could result in a
-       noticable lag.  If this is a problem, then disable this option.
+       noticeable lag.  If this is a problem, then disable this option.
 
 endmenu