[kernel] r13612 - in dists/trunk/linux-2.6/debian: . config/mips config/mipsel

[Martin Michlmayr]

Author: tbm
Date: Tue May 12 22:02:00 2009
New Revision: 13612

Log:
[mips/sb1-bcm91250a, mips/sb1a-bcm91480b] Compile in CONFIG_SB1250_MAC.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue May 12 20:32:08 2009	(r13611)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May 12 22:02:00 2009	(r13612)
@@ -36,9 +36,9 @@
     BLK_DEV_IO_TRACE, CONTEXT_SWITCH_TRACER, ARM_UNWIND and
     SECURITY_SELINUX because of size constraints.
   * [armel/kirkwood] Add CPU idle driver (Rabeeh Khoury)
-  * [mips/sb1-bcm91250a, mipsel/sb1-bcm91250a] There is a platform PATA
-    driver for SWARM IDE these days, so disable IDE and build in ATA,
-    SCSI and BLK_DEV_SD.
+  * [mips/sb1-bcm91250a] There is a platform PATA driver for SWARM IDE
+    these days, so disable IDE and build in ATA, SCSI and BLK_DEV_SD.
+  * [mips/sb1-bcm91250a, mips/sb1a-bcm91480b] Compile in CONFIG_SB1250_MAC.
 
  -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue May 12 20:32:08 2009	(r13611)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue May 12 22:02:00 2009	(r13612)
@@ -525,6 +525,8 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -537,11 +539,6 @@
 # CONFIG_ARCNET is not set
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-# CONFIG_PHYLIB is not set
-
-##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue May 12 20:32:08 2009	(r13611)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue May 12 22:02:00 2009	(r13612)
@@ -556,6 +556,8 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -568,11 +570,6 @@
 # CONFIG_ARCNET is not set
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-# CONFIG_PHYLIB is not set
-
-##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Tue May 12 20:32:08 2009	(r13611)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Tue May 12 22:02:00 2009	(r13612)
@@ -525,6 +525,8 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -537,11 +539,6 @@
 # CONFIG_ARCNET is not set
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-# CONFIG_PHYLIB is not set
-
-##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Tue May 12 20:32:08 2009	(r13611)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Tue May 12 22:02:00 2009	(r13612)
@@ -555,6 +555,8 @@
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_NETCONSOLE is not set
+CONFIG_NETDEV_1000=y
+CONFIG_SB1250_MAC=y
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -567,11 +569,6 @@
 # CONFIG_ARCNET is not set
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-# CONFIG_PHYLIB is not set
-
-##
 ## file: drivers/net/tokenring/Kconfig
 ##
 # CONFIG_TR is not set