[PATCH] Section mismatch in drivers/net/ne.o during modpost

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6fe532d82417d8acf89bc3a97217999cd5b09344..01c5c082f9705e43c7705857fe5171bd4bb7c528 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -14,6 +14,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -27,11 +31,6 @@ config S390
        bool
        default y
 
-config UID16
-       bool
-       default y
-       depends on !64BIT
-
 source "init/Kconfig"
 
 menu "Base setup"
@@ -85,6 +84,10 @@ config HOTPLUG_CPU
          can be controlled through /sys/devices/system/cpu/cpu#.
          Say N if you want to disable CPU hotplug.
 
+config DEFAULT_MIGRATION_COST
+       int
+       default "1000000"
+
 config MATHEMU
        bool "IEEE FPU emulation"
        depends on MARCH_G5
@@ -461,6 +464,8 @@ config PCMCIA
 
 source "drivers/base/Kconfig"
 
+source "drivers/connector/Kconfig"
+
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"