[kernel] r8508 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Wed Apr 25 14:18:14 2007
New Revision: 8508

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options3.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Mark CHELSIO_T3 as broken on ARM.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Apr 25 14:18:14 2007
@@ -14,6 +14,7 @@
   [ Martin Michlmayr ]
   * Add armel (arm with EABI) support.  Thanks, Lennert Buytenhek and
     Joey Hess.  Closes: #410853.
+  * Mark CHELSIO_T3 as broken on ARM.
 
  -- maximilian attems <maks at debian.org>  Tue, 10 Apr 2007 14:42:30 +0200
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options2.patch	Wed Apr 25 14:18:14 2007
@@ -0,0 +1,24 @@
+diff -Naur linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig linux-2.6-2.6.20/drivers/mtd/nand/Kconfig
+--- linux-2.6-2.6.20.orig/drivers/mtd/nand/Kconfig	2007-02-04 11:44:54.000000000 -0700
++++ linux-2.6-2.6.20/drivers/mtd/nand/Kconfig	2007-04-18 22:02:18.000000000 -0600
+@@ -223,7 +223,7 @@
+ 
+ config MTD_NAND_CAFE
+        tristate "NAND support for OLPC CAFÉ chip"
+-       depends on PCI
++       depends on PCI && (!ARM || BROKEN)
+        help
+ 	 Use NAND flash attached to the CAFÉ chip designed for the $100
+ 	 laptop.
+diff -Naur linux-2.6-2.6.20.orig/drivers/net/Kconfig linux-2.6-2.6.20/drivers/net/Kconfig
+--- linux-2.6-2.6.20.orig/drivers/net/Kconfig	2007-04-18 22:16:48.000000000 -0600
++++ linux-2.6-2.6.20/drivers/net/Kconfig	2007-04-18 22:16:29.000000000 -0600
+@@ -2484,7 +2484,7 @@
+ 
+ config NETXEN_NIC
+ 	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+-	depends on PCI && (!SPARC32 || BROKEN)
++	depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
+ 	help
+ 	  This enables the support for NetXen's Gigabit Ethernet card.
+ 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options3.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options3.patch	Wed Apr 25 14:18:14 2007
@@ -0,0 +1,11 @@
+--- linux-2.6-2.6.20/drivers/net/Kconfig~	2007-04-25 14:10:24.000000000 +0000
++++ linux-2.6-2.6.20/drivers/net/Kconfig	2007-04-25 14:11:20.000000000 +0000
+@@ -2373,7 +2373,7 @@
+ 
+ config CHELSIO_T3
+ 	tristate "Chelsio Communications T3 10Gb Ethernet support"
+-	depends on PCI
++	depends on PCI && (!ARM || BROKEN)
+ 	select FW_LOADER
+ 	help
+ 	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Apr 25 14:18:14 2007
@@ -29,6 +29,8 @@
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + bugfix/drivers-bus_to_virt.patch
 + bugfix/arm/disable-broken-config-options.patch
++ bugfix/arm/disable-broken-config-options2.patch
++ bugfix/arm/disable-broken-config-options3.patch
 # check upstream fix!?
 #+ bugfix/arm/cyber2010_burst.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch