[kernel] r5396 - in dists/trunk/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Tue Jan 10 23:11:01 2006
New Revision: 5396

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/changelog
Log:
[arm] Activate the right network drivers on Footbridge (Tulip and NE2K).


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Tue Jan 10 23:11:01 2006
@@ -602,8 +602,6 @@
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
 # CONFIG_EL1 is not set
 # CONFIG_EL2 is not set
 # CONFIG_ELPLUS is not set
@@ -638,7 +636,6 @@
 # CONFIG_E100 is not set
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
-CONFIG_NE2K_PCI=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_SIS900 is not set
@@ -1753,3 +1750,12 @@
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_TULIP=y
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_NE2K_PCI=m
+# CONFIG_CASSINI is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jan 10 23:11:01 2006
@@ -5,6 +5,8 @@
   * [arm] Activate IDEPCI on footbridge so SL82C105 will really be
     compiled in.
   * [arm] Activate tmpfs.
+  * [arm] Activate the right network drivers on Footbridge (Tulip and
+    NE2K).
 
  -- Martin Michlmayr <tbm at cyrius.com>  Tue, 10 Jan 2006 22:59:19 +0000