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 branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
configs
/
performance_defconfig
diff --git
a/arch/s390/configs/performance_defconfig
b/arch/s390/configs/performance_defconfig
index 61db449bf309c058c7c7a063f2e6eee6fd4472d4..13559d32af696b9917d9c84678beea19f498461f 100644
(file)
--- a/
arch/s390/configs/performance_defconfig
+++ b/
arch/s390/configs/performance_defconfig
@@
-59,6
+59,7
@@
CONFIG_CRASH_DUMP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m
CONFIG_HIBERNATION=y
+CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y