Author: fs
Date: Fri Jan 5 16:55:24 2007
New Revision: 8121
Added:
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
Modified:
dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
Log:
Add removal patches for: 3c359, smctr, keyspan, cops
Added:
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
==============================================================================
--- (empty file)
+++
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
Fri Jan 5 16:55:24 2007
@@ -0,0 +1,45 @@
+diff -ruN a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
+--- a/drivers/net/appletalk/Kconfig 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/appletalk/Kconfig 2007-01-05 15:34:44.000000000 +0000
+@@ -49,32 +49,6 @@
+ This driver is experimental, which means that it may not work.
+ See the file <file:Documentation/networking/ltpc.txt>.
+
+-config COPS
+- tristate "COPS LocalTalk PC support"
+- depends on DEV_APPLETALK && (ISA || EISA)
+- help
+- This allows you to use COPS AppleTalk cards to connect to LocalTalk
+- networks. You also need version 1.3.3 or later of the netatalk
+- package. This driver is experimental, which means that it may not
+- work. This driver will only work if you choose "AppleTalk DDP"
+- networking support, above.
+- Please read the file <file:Documentation/networking/cops.txt>.
+-
+-config COPS_DAYNA
+- bool "Dayna firmware support"
+- depends on COPS
+- help
+- Support COPS compatible cards with Dayna style firmware (Dayna
+- DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC
+- III, Farallon PhoneNET PC II).
+-
+-config COPS_TANGENT
+- bool "Tangent firmware support"
+- depends on COPS
+- help
+- Support COPS compatible cards with Tangent style firmware (Tangent
+- ATB_II, Novell NL-1000, Daystar Digital LT-200.
+-
+ config IPDDP
+ tristate "Appletalk-IP driver support"
+ depends on DEV_APPLETALK && ATALK
+diff -ruN a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile
+--- a/drivers/net/appletalk/Makefile 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/appletalk/Makefile 2007-01-05 15:34:11.000000000 +0000
+@@ -3,5 +3,4 @@
+ #
+
+ obj-$(CONFIG_IPDDP) += ipddp.o
+-obj-$(CONFIG_COPS) += cops.o
+ obj-$(CONFIG_LTPC) += ltpc.o
Added:
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
==============================================================================
--- (empty file)
+++
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
Fri Jan 5 16:55:24 2007
@@ -0,0 +1,59 @@
+diff -ruN a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
+--- a/drivers/net/tokenring/Kconfig 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/tokenring/Kconfig 2007-01-05 15:26:27.000000000 +0000
+@@ -64,24 +64,6 @@
+ To compile this driver as a module, choose M here: the module will be
+ called lanstreamer.
+
+-config 3C359
+- tristate "3Com 3C359 Token Link Velocity XL adapter support"
+- depends on TR && PCI
+- ---help---
+- This is support for the 3Com PCI Velocity XL cards, specifically
+- the 3Com 3C359, please note this is not for the 3C339 cards, you
+- should use the tms380 driver instead.
+-
+- If you have such an adapter, say Y and read the Token-Ring
+- mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
+-
+- To compile this driver as a module, choose M here: the module will be
+- called 3c359.
+-
+- Also read the file <file:Documentation/networking/3c359.txt> or check
the
+- Linux Token Ring Project site for the latest information at
+- <http://www.linuxtr.net>
+-
+ config TMS380TR
+ tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
+ depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
+@@ -166,21 +148,5 @@
+ To compile this driver as a module, choose M here: the module will be
+ called madgemc.
+
+-config SMCTR
+- tristate "SMC ISA/MCA adapter support"
+- depends on TR && (ISA || MCA_LEGACY) && (BROKEN || !64BIT)
+- ---help---
+- This is support for the ISA and MCA SMC Token Ring cards,
+- specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
+- (8115T/A) adapters.
+-
+- If you have such an adapter and would like to use it, say Y or M and
+- read the Token-Ring mini-HOWTO, available from
+- <http://www.tldp.org/docs.html#howto> and the file
+- <file:Documentation/networking/smctr.txt>.
+-
+- To compile this driver as a module, choose M here: the module will be
+- called smctr.
+-
+ endmenu
+
+diff -ruN a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
+--- a/drivers/net/tokenring/Makefile 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/tokenring/Makefile 2007-01-05 15:26:04.000000000 +0000
+@@ -11,5 +11,3 @@
+ obj-$(CONFIG_PROTEON) += proteon.o
+ obj-$(CONFIG_TMSPCI) += tmspci.o
+ obj-$(CONFIG_SKISA) += skisa.o
+-obj-$(CONFIG_SMCTR) += smctr.o
+-obj-$(CONFIG_3C359) += 3c359.o
Added:
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
==============================================================================
--- (empty file)
+++
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
Fri Jan 5 16:55:24 2007
@@ -0,0 +1,113 @@
+diff -ruN a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
+--- a/drivers/usb/serial/Kconfig 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/usb/serial/Kconfig 2007-01-05 15:44:57.000000000 +0000
+@@ -283,98 +283,6 @@
+ To compile this driver as a module, choose M here: the
+ module will be called keyspan_pda.
+
+-config USB_SERIAL_KEYSPAN
+- tristate "USB Keyspan USA-xxx Serial Driver"
+- depends on USB_SERIAL
+- ---help---
+- Say Y here if you want to use Keyspan USB to serial converter
+- devices. This driver makes use of Keyspan's official firmware
+- and was developed with their support. You must also include
+- firmware to support your particular device(s).
+-
+- See <http://misc.nu/hugh/keyspan.html> for more information.
+-
+- To compile this driver as a module, choose M here: the
+- module will be called keyspan.
+-
+-config USB_SERIAL_KEYSPAN_MPR
+- bool "USB Keyspan MPR Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the Keyspan MPR converter.
+-
+-config USB_SERIAL_KEYSPAN_USA28
+- bool "USB Keyspan USA-28 Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-28 converter.
+-
+-config USB_SERIAL_KEYSPAN_USA28X
+- bool "USB Keyspan USA-28X Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-28X converter.
+- Be sure you have a USA-28X, there are also 28XA and 28XB
+- models, the label underneath has the actual part number.
+-
+-config USB_SERIAL_KEYSPAN_USA28XA
+- bool "USB Keyspan USA-28XA Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-28XA converter.
+- Be sure you have a USA-28XA, there are also 28X and 28XB
+- models, the label underneath has the actual part number.
+-
+-config USB_SERIAL_KEYSPAN_USA28XB
+- bool "USB Keyspan USA-28XB Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-28XB converter.
+- Be sure you have a USA-28XB, there are also 28X and 28XA
+- models, the label underneath has the actual part number.
+-
+-config USB_SERIAL_KEYSPAN_USA19
+- bool "USB Keyspan USA-19 Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-19 converter.
+-
+-config USB_SERIAL_KEYSPAN_USA18X
+- bool "USB Keyspan USA-18X Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-18X converter.
+-
+-config USB_SERIAL_KEYSPAN_USA19W
+- bool "USB Keyspan USA-19W Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-19W converter.
+-
+-config USB_SERIAL_KEYSPAN_USA19QW
+- bool "USB Keyspan USA-19QW Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-19QW converter.
+-
+-config USB_SERIAL_KEYSPAN_USA19QI
+- bool "USB Keyspan USA-19QI Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-19QI converter.
+-
+-config USB_SERIAL_KEYSPAN_USA49W
+- bool "USB Keyspan USA-49W Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-49W converter.
+-
+-config USB_SERIAL_KEYSPAN_USA49WLC
+- bool "USB Keyspan USA-49WLC Firmware"
+- depends on USB_SERIAL_KEYSPAN
+- help
+- Say Y here to include firmware for the USA-49WLC converter.
+-
+ config USB_SERIAL_KLSI
+ tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
+ depends on USB_SERIAL && EXPERIMENTAL
+diff -ruN a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
+--- a/drivers/usb/serial/Makefile 2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/usb/serial/Makefile 2007-01-05 15:54:10.000000000 +0000
+@@ -29,7 +29,6 @@
+ obj-$(CONFIG_USB_SERIAL_IPAQ) += ipaq.o
+ obj-$(CONFIG_USB_SERIAL_IPW) += ipw.o
+ obj-$(CONFIG_USB_SERIAL_IR) += ir-usb.o
+-obj-$(CONFIG_USB_SERIAL_KEYSPAN) += keyspan.o
+ obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda.o
+ obj-$(CONFIG_USB_SERIAL_KLSI) += kl5kusb105.o
+ obj-$(CONFIG_USB_SERIAL_KOBIL_SCT) += kobil_sct.o
Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1 (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1 Fri Jan 5
16:55:24 2007
@@ -15,9 +15,14 @@
drivers/usb/misc/emi62.c
drivers/usb/misc/emi62_fw_s.h
drivers/usb/misc/emi62_fw_m.h
+
drivers/usb/misc/emi26.c
drivers/usb/misc/emi26_fw.h
+drivers/net/tokenring/3c359_microcode.h
+drivers/net/tokenring/3c359.h
+drivers/net/tokenring/3c359.c
+
drivers/net/tokenring/smctr.h
drivers/net/tokenring/smctr_firmware.h
drivers/net/tokenring/smctr.c
@@ -30,19 +35,14 @@
drivers/usb/misc/emi26_fw.h
drivers/usb/misc/emi26.c
-drivers/net/tokenring/3c359_microcode.h
-drivers/net/tokenring/3c359.h
-drivers/net/tokenring/3c359.c
drivers/usb/serial/keyspan_usa19_fw.h
drivers/usb/serial/keyspan_usa19qi_fw.h
drivers/usb/serial/keyspan_usa19qw_fw.h
drivers/usb/serial/keyspan_usa18x_fw.h
drivers/usb/serial/keyspan_usa19w_fw.h
-drivers/usb/serial/keyspan_pda_fw.h
drivers/usb/serial/keyspan_usa49wlc_fw.h
drivers/usb/serial/keyspan_usa28xb_fw.h
drivers/usb/serial/keyspan_usa28x_fw.h
-drivers/usb/serial/Makefile-keyspan_pda_fw
drivers/usb/serial/keyspan_usa49w_fw.h
drivers/usb/serial/keyspan_usa28xa_fw.h
drivers/usb/serial/keyspan_usa28_fw.h
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
