summaryrefslogtreecommitdiff
path: root/arch/s390/configs/default_defconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-24 16:48:32 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-24 16:48:32 -0400
commit4daaab4f0c2b55adccab08da06e17acc270cb84a (patch)
tree41dfea3867755d3853218d50533c5600ac8fa6c0 /arch/s390/configs/default_defconfig
parent3c4d1daecef875d28bdbe93587908c897c29ba71 (diff)
parentb94d525e58dc9638dd3f98094cb468bcfb262039 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390/configs/default_defconfig')
-rw-r--r--arch/s390/configs/default_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 3ca1894ade09..9d94fdd9f525 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -63,6 +63,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