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

[Gordon Farquharson]

Author: gordon-guest
Date: Mon Feb 18 18:10:28 2008
New Revision: 10573

Log:
arm: Disable R6040 driver (does not build on footbridge)


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-r6040.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-r6040.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-r6040.patch	Mon Feb 18 18:10:28 2008
@@ -0,0 +1,13 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index e706744..ce85d44 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -1613,7 +1613,7 @@ config 8139_OLD_RX_RESET
+ 
+ config R6040
+ 	tristate "RDC R6040 Fast Ethernet Adapter support (EXPERIMENTAL)"
+-	depends on NET_PCI && PCI
++	depends on NET_PCI && PCI && (!ARM || BROKEN)
+ 	select CRC32
+ 	select MII
+ 	help

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	Mon Feb 18 18:10:28 2008
@@ -29,6 +29,7 @@
 + bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
 + bugfix/arm/disable-ath5k.patch
++ patches/bugfix/arm/disable-r6040.patch
 #the following will be fixed before 2.6.25 is out:
 + bugfix/sata_mv-platform_driver.patch
 + bugfix/arm/ignore-invalid-memtags.patch