From 34f9218fe519cd922889076cc7698bd73bdb9f92 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Wed, 26 Oct 2011 18:23:52 -0400
Subject: 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.
---
 config-s390x | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config-s390x')

diff --git a/config-s390x b/config-s390x
index 5251b5b32..f03942191 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
-- 
cgit