* 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. svn path=/dists/trunk/linux-2.6/; revision=9563
This commit is contained in:
parent
d5c6efb09d
commit
0d91d4bbb3
|
@ -51,12 +51,14 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low
|
|||
- 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.
|
||||
|
||||
|
|
|
@ -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
|
|
@ -30,6 +30,8 @@ rm drivers/net/dgrs_plx9060.h
|
|||
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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue