diff --git a/debian/changelog b/debian/changelog index 6953df2ca..0124ae11e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,11 +50,13 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low - ESS Allegro/Maestro3 - Yamaha YMF724/740/744/754 - Technotrend/Hauppauge Nova-USB devices + - YAM driver for AX.25 * 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 * Add -common to common header package names. * Drop provides from common header packages. diff --git a/debian/patches/debian/dfsg/drivers-net-hamradio-yam.patch b/debian/patches/debian/dfsg/drivers-net-hamradio-yam.patch new file mode 100644 index 000000000..d6d079d46 --- /dev/null +++ b/debian/patches/debian/dfsg/drivers-net-hamradio-yam.patch @@ -0,0 +1,8 @@ +diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig +index 36d2c7d..2fcffaf 100644 +--- a/drivers/net/hamradio/Kconfig ++++ b/drivers/net/hamradio/Kconfig +@@ -183,2 +183,3 @@ config YAM + tristate "YAM driver for AX.25" ++ depends on BROKEN + depends on AX25 && !S390 diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index ec36d8287..11aefe509 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -27,6 +27,9 @@ rm drivers/net/dgrs_firmware.c rm drivers/net/dgrs_i82596.h rm drivers/net/dgrs_plx9060.h +rm drivers/net/hamradio/yam1200.h +rm drivers/net/hamradio/yam9600.h + rm drivers/net/tokenring/3c359.c rm drivers/net/tokenring/3c359.h rm drivers/net/tokenring/3c359_microcode.h diff --git a/debian/patches/series/orig-0 b/debian/patches/series/orig-0 index 11bbc9357..752e7f339 100644 --- a/debian/patches/series/orig-0 +++ b/debian/patches/series/orig-0 @@ -4,6 +4,7 @@ + debian/dfsg/drivers-net-acenic-remove.patch + debian/dfsg/drivers-net-appletalk-cops.patch + debian/dfsg/drivers-net-dgrs.patch ++ debian/dfsg/drivers-net-hamradio-yam.patch + debian/dfsg/drivers-net-tg3-remove.patch + debian/dfsg/drivers-net-tokenring-3c359-smctr.patch + debian/dfsg/drivers-usb-misc-emi62-emi26.patch