From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 28 Mar 2007 19:30:23 +0000 (+0000)
Subject: disabled bcm5700 driver module inclusion/compilation, as this functionality should... 
X-Git-Tag: planetlab-4_0-rc3~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d0ecc7d4f6872eb0e77e493eb6b4f3a718958397;p=linux-2.6.git

disabled bcm5700 driver module inclusion/compilation, as this functionality should not be subsumed by the backported tg3/bnx2 drivers
---

diff --git a/configs/kernel-2.6.12-i686-onelab.config b/configs/kernel-2.6.12-i686-onelab.config
index 5c9a1238b..1904739d3 100644
--- a/configs/kernel-2.6.12-i686-onelab.config
+++ b/configs/kernel-2.6.12-i686-onelab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12-1.1398_FC4.7.planetlab
-# Wed Feb 14 14:00:56 2007
+# Wed Mar 28 19:28:04 2007
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -845,7 +845,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_BCM5700=m
+# CONFIG_BCM5700 is not set
 
 #
 # Ethernet (10000 Mbit)
diff --git a/configs/kernel-2.6.12-i686-planetlab.config b/configs/kernel-2.6.12-i686-planetlab.config
index b689dcded..650541dbe 100644
--- a/configs/kernel-2.6.12-i686-planetlab.config
+++ b/configs/kernel-2.6.12-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-1.1398_FC4.4.planetlab
-# Mon Feb 20 13:12:11 2006
+# Linux kernel version: 2.6.12-1.1398_FC4.7.planetlab
+# Wed Mar 28 19:06:02 2007
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -809,7 +809,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_BCM5700=m
+# CONFIG_BCM5700 is not set
 
 #
 # Ethernet (10000 Mbit)
diff --git a/configs/kernel-2.6.12-i686-smp-planetlab.config b/configs/kernel-2.6.12-i686-smp-planetlab.config
index b427fb4ef..25b176e1c 100644
--- a/configs/kernel-2.6.12-i686-smp-planetlab.config
+++ b/configs/kernel-2.6.12-i686-smp-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-1.1398_FC4.4.planetlab.2006.01.19
-# Thu Jan 19 23:56:45 2006
+# Linux kernel version: 2.6.12-1.1398_FC4.7.planetlab
+# Wed Mar 28 19:27:24 2007
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -820,7 +820,7 @@ CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_BCM5700=m
+# CONFIG_BCM5700 is not set
 
 #
 # Ethernet (10000 Mbit)