[kernel] r9563 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series

[Bastian Blank]

Author: waldi
Date: Wed Sep 26 19:50:36 2007
New Revision: 9563

Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/files-1: Drop file.
* debian/patches/debian/dfsg/drivers-net-myri.patch: Add.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-myri.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Sep 26 19:50:36 2007
@@ -51,12 +51,14 @@
     - Yamaha YMF724/740/744/754
     - Technotrend/Hauppauge Nova-USB devices
     - YAM driver for AX.25
+    - MyriCOM Gigabit Ethernet support
   * Disable now broken drivers:
     - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
     - Broadcom Tigon3 support
     - USB Keyspan USA-xxx Serial Driver
     - Technotrend/Hauppauge Nova-USB devices
     - YAM driver for AX.25
+    - MyriCOM Gigabit Ethernet support
   * Add -common to common header package names.
   * Drop provides from common header packages.
 

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-myri.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-myri.patch	Wed Sep 26 19:50:36 2007
@@ -0,0 +1,8 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index c551925..b09086b 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2075,2 +2075,3 @@ config MYRI_SBUS
+ 	tristate "MyriCOM Gigabit Ethernet support"
++	depends on BROKEN
+ 	depends on SBUS

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Wed Sep 26 19:50:36 2007
@@ -30,6 +30,8 @@
 rm drivers/net/hamradio/yam1200.h
 rm drivers/net/hamradio/yam9600.h
 
+rm drivers/net/myri_code.h
+
 rm drivers/net/tokenring/3c359.c
 rm drivers/net/tokenring/3c359.h
 rm drivers/net/tokenring/3c359_microcode.h

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Wed Sep 26 19:50:36 2007
@@ -5,6 +5,7 @@
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-net-dgrs.patch
 + debian/dfsg/drivers-net-hamradio-yam.patch
++ debian/dfsg/drivers-net-myri.patch
 + debian/dfsg/drivers-net-tg3-remove.patch
 + debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
 + debian/dfsg/drivers-usb-misc-emi62-emi26.patch