diff options
author | 2014-09-24 16:48:32 -0400 | |
---|---|---|
committer | 2014-09-24 16:48:32 -0400 | |
commit | 4daaab4f0c2b55adccab08da06e17acc270cb84a (patch) | |
tree | 41dfea3867755d3853218d50533c5600ac8fa6c0 /arch/s390/defconfig | |
parent | vxlan: Fix bug introduced by commit acbf74a76300 (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-4daaab4f0c2b55adccab08da06e17acc270cb84a.tar.xz linux-dev-4daaab4f0c2b55adccab08da06e17acc270cb84a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390/defconfig')
-rw-r--r-- | arch/s390/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 2e56498a40df..fab35a8efa4f 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -50,6 +50,7 @@ CONFIG_CMA=y CONFIG_CRASH_DUMP=y CONFIG_BINFMT_MISC=m CONFIG_HIBERNATION=y +CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_NET_KEY=y |