projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
arch
/
s390
/
Kconfig
diff --git
a/arch/s390/Kconfig
b/arch/s390/Kconfig
index
b66602a
..
01c5c08
100644
(file)
--- a/
arch/s390/Kconfig
+++ b/
arch/s390/Kconfig
@@
-14,6
+14,10
@@
config RWSEM_XCHGADD_ALGORITHM
bool
default y
bool
default y
+config GENERIC_HWEIGHT
+ bool
+ default y
+
config GENERIC_CALIBRATE_DELAY
bool
default y
config GENERIC_CALIBRATE_DELAY
bool
default y
@@
-80,6
+84,10
@@
config HOTPLUG_CPU
can be controlled through /sys/devices/system/cpu/cpu#.
Say N if you want to disable CPU hotplug.
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
config MATHEMU
bool "IEEE FPU emulation"
depends on MARCH_G5
@@
-456,6
+464,8
@@
config PCMCIA
source "drivers/base/Kconfig"
source "drivers/base/Kconfig"
+source "drivers/connector/Kconfig"
+
source "drivers/scsi/Kconfig"
source "drivers/s390/Kconfig"
source "drivers/scsi/Kconfig"
source "drivers/s390/Kconfig"