summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-26 18:23:52 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-26 21:03:18 -0400
commit34f9218fe519cd922889076cc7698bd73bdb9f92 (patch)
tree50217145a1dd12d404471d7c32f1093ffdc916b7 /config-s390x
parent829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff)
downloadkernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet drivers into vendor subdirectories caused a lot of churn in config-generic, but hopefully it's a bit cleaner now.
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index 5251b5b3..f0394219 100644
--- a/config-s390x
+++ b/config-s390x
@@ -237,3 +237,5 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_WARN_DYNAMIC_STACK is not set
CONFIG_CRYPTO_GHASH_S390=m
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y