git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
Kconfig
diff --git
a/arch/s390/Kconfig
b/arch/s390/Kconfig
index 8f5f02160ffcef2d57c458790537456ee3c06626..29a7940f284f62fa1f9e27508bc7d55f9b50aca4 100644
(file)
--- a/
arch/s390/Kconfig
+++ b/
arch/s390/Kconfig
@@
-300,6
+300,14
@@
comment "Kernel preemption"
source "kernel/Kconfig.preempt"
+config ARCH_SPARSEMEM_ENABLE
+ def_bool y
+ select SPARSEMEM_VMEMMAP_ENABLE
+ select SPARSEMEM_VMEMMAP
+
+config ARCH_SPARSEMEM_DEFAULT
+ def_bool y
+
source "mm/Kconfig"
comment "I/O subsystem configuration"