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

[Martin Michlmayr]

Author: tbm
Date: Thu Aug 21 10:01:02 2008
New Revision: 12119

Log:
MYRI10GE fails to build on ARM now


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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-myri10ge_nic.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-myri10ge_nic.patch	Thu Aug 21 10:01:02 2008
@@ -0,0 +1,15 @@
+http://bugzilla.kernel.org/show_bug.cgi?id=11334
+
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index a5c141c..2f25dfc 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2428,7 +2428,7 @@ config S2IO
+ 
+ config MYRI10GE
+ 	tristate "Myricom Myri-10G Ethernet support"
+-	depends on PCI && INET
++	depends on PCI && INET && (!ARM || BROKEN)
+ 	select FW_LOADER
+ 	select CRC32
+ 	select INET_LRO

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	Thu Aug 21 10:01:02 2008
@@ -26,6 +26,7 @@
 + bugfix/arm/disable-scsi_acard.patch
 + bugfix/arm/disable-ath5k.patch
 + bugfix/arm/disable-r6040.patch
++ bugfix/arm/disable-myri10ge_nic.patch
 + bugfix/arm/kurobox_fix_nr_controllers.patch
 + bugfix/arm/tsx09-fix-mac.patch
 + bugfix/arm/tsx09-init-uart1.patch