Remove not longer needed dfsg patches.
debian/patches/debian/dfsg/drivers-atm.patch, debian/patches/debian/dfsg/drivers-char-computone.patch, debian/patches/debian/dfsg/drivers-media-dvb-ttusb-budget.patch, debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch, debian/patches/debian/dfsg/drivers-usb-serial-keyspan-remove.patch: Remove. svn path=/dists/trunk/linux-2.6/; revision=12031
This commit is contained in:
Bastian Blank
parent
fc909acd90
commit
51368f6252
|
|
@ -1,115 +0,0 @@
|
|||
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
|
||||
index b554eda..8f8de2e 100644
|
||||
--- a/drivers/atm/Kconfig
|
||||
+++ b/drivers/atm/Kconfig
|
||||
@@ -247,2 +247,3 @@ config ATM_AMBASSADOR
|
||||
tristate "Madge Ambassador (Collage PCI 155 Server)"
|
||||
+ depends on BROKEN
|
||||
depends on PCI && VIRT_TO_BUS
|
||||
@@ -345,2 +346,3 @@ config ATM_FORE200E_PCA
|
||||
bool "PCA-200E support"
|
||||
+ depends on BROKEN
|
||||
depends on ATM_FORE200E_MAYBE && PCI
|
||||
@@ -349,26 +351,5 @@ config ATM_FORE200E_PCA
|
||||
|
||||
-config ATM_FORE200E_PCA_DEFAULT_FW
|
||||
- bool "Use default PCA-200E firmware (normally enabled)"
|
||||
- depends on ATM_FORE200E_PCA
|
||||
- help
|
||||
- Use the default PCA-200E firmware data shipped with the driver.
|
||||
-
|
||||
- Normal users do not have to deal with the firmware stuff, so
|
||||
- they should say Y here.
|
||||
-
|
||||
-config ATM_FORE200E_PCA_FW
|
||||
- string "Pathname of user-supplied binary firmware"
|
||||
- depends on ATM_FORE200E_PCA && !ATM_FORE200E_PCA_DEFAULT_FW
|
||||
- default ""
|
||||
- help
|
||||
- This defines the pathname of an alternative PCA-200E binary
|
||||
- firmware image supplied by the user. This pathname may be
|
||||
- absolute or relative to the drivers/atm directory.
|
||||
-
|
||||
- The driver comes with an adequate firmware image, so normal users do
|
||||
- not have to supply an alternative one. They just say Y to "Use
|
||||
- default PCA-200E firmware" instead.
|
||||
-
|
||||
config ATM_FORE200E_SBA
|
||||
bool "SBA-200E support"
|
||||
+ depends on BROKEN
|
||||
depends on ATM_FORE200E_MAYBE && SBUS
|
||||
@@ -377,24 +358,2 @@ config ATM_FORE200E_SBA
|
||||
|
||||
-config ATM_FORE200E_SBA_DEFAULT_FW
|
||||
- bool "Use default SBA-200E firmware (normally enabled)"
|
||||
- depends on ATM_FORE200E_SBA
|
||||
- help
|
||||
- Use the default SBA-200E firmware data shipped with the driver.
|
||||
-
|
||||
- Normal users do not have to deal with the firmware stuff, so
|
||||
- they should say Y here.
|
||||
-
|
||||
-config ATM_FORE200E_SBA_FW
|
||||
- string "Pathname of user-supplied binary firmware"
|
||||
- depends on ATM_FORE200E_SBA && !ATM_FORE200E_SBA_DEFAULT_FW
|
||||
- default ""
|
||||
- help
|
||||
- This defines the pathname of an alternative SBA-200E binary
|
||||
- firmware image supplied by the user. This pathname may be
|
||||
- absolute or relative to the drivers/atm directory.
|
||||
-
|
||||
- The driver comes with an adequate firmware image, so normal users do
|
||||
- not have to supply an alternative one. They just say Y to "Use
|
||||
- default SBA-200E firmware", above.
|
||||
-
|
||||
config ATM_FORE200E_USE_TASKLET
|
||||
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
|
||||
index 1b16f81..3b2fd66 100644
|
||||
--- a/drivers/atm/Makefile
|
||||
+++ b/drivers/atm/Makefile
|
||||
@@ -5,10 +5,2 @@
|
||||
fore_200e-objs := fore200e.o
|
||||
-hostprogs-y := fore200e_mkfirm
|
||||
-
|
||||
-# Files generated that shall be removed upon make clean
|
||||
-clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \
|
||||
- pca200e.bin1 pca200e.bin2 pca200e_ecd.bin pca200e_ecd.bin1 \
|
||||
- pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 sba200e_ecd.bin2
|
||||
-# Firmware generated that shall be removed upon make clean
|
||||
-clean-files += fore200e_pca_fw.c fore200e_sba_fw.c
|
||||
|
||||
@@ -38,17 +30,2 @@ obj-$(CONFIG_ATM_LANAI) += lanai.o
|
||||
|
||||
-ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
|
||||
- fore_200e-objs += fore200e_pca_fw.o
|
||||
- # guess the target endianess to choose the right PCA-200E firmware image
|
||||
- ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
|
||||
- byteorder.h := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h
|
||||
- CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) $(KBUILD_CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(CONFIG_ATM_FORE200E_SBA),y)
|
||||
- fore_200e-objs += fore200e_sba_fw.o
|
||||
- ifeq ($(CONFIG_ATM_FORE200E_SBA_DEFAULT_FW),y)
|
||||
- CONFIG_ATM_FORE200E_SBA_FW := $(obj)/sba200e_ecd.bin2
|
||||
- endif
|
||||
-endif
|
||||
obj-$(CONFIG_ATM_HE) += he.o
|
||||
@@ -58,16 +35 @@ endif
|
||||
|
||||
-# FORE Systems 200E-series firmware magic
|
||||
-$(obj)/fore200e_pca_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_PCA_FW)) \
|
||||
- $(obj)/fore200e_mkfirm
|
||||
- $(obj)/fore200e_mkfirm -k -b _fore200e_pca_fw \
|
||||
- -i $(CONFIG_ATM_FORE200E_PCA_FW) -o $@
|
||||
-
|
||||
-$(obj)/fore200e_sba_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_SBA_FW)) \
|
||||
- $(obj)/fore200e_mkfirm
|
||||
- $(obj)/fore200e_mkfirm -k -b _fore200e_sba_fw \
|
||||
- -i $(CONFIG_ATM_FORE200E_SBA_FW) -o $@
|
||||
-
|
||||
-# deal with the various suffixes of the binary firmware images
|
||||
-$(obj)/%.bin $(obj)/%.bin1 $(obj)/%.bin2: $(src)/%.data
|
||||
- objcopy -Iihex $< -Obinary $@.gz
|
||||
- gzip -n -df $@.gz
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
mark ip2 broken due to not using request_firmware()
|
||||
|
||||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
|
||||
index 2d854bb..7d3f39e 100644
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -108,6 +108,7 @@ config SERIAL_NONSTANDARD
|
||||
|
||||
config COMPUTONE
|
||||
tristate "Computone IntelliPort Plus serial support"
|
||||
+ depends on BROKEN
|
||||
depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
|
||||
---help---
|
||||
This driver supports the entire family of Intelliport II/Plus
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig
|
||||
index f546bcc..1b24079 100644
|
||||
--- a/drivers/media/dvb/ttusb-budget/Kconfig
|
||||
+++ b/drivers/media/dvb/ttusb-budget/Kconfig
|
||||
@@ -2,2 +2,3 @@ config DVB_TTUSB_BUDGET
|
||||
tristate "Technotrend/Hauppauge Nova-USB devices"
|
||||
+ depends on BROKEN
|
||||
depends on DVB_CORE && USB && I2C
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
diff -ruN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
|
||||
--- a/drivers/usb/misc/Kconfig 2007-02-04 19:44:54.000000000 +0100
|
||||
+++ b/drivers/usb/misc/Kconfig 2007-02-05 16:45:33.000000000 +0100
|
||||
@@ -4,34 +4,6 @@
|
||||
comment "USB Miscellaneous drivers"
|
||||
depends on USB
|
||||
|
||||
-config USB_EMI62
|
||||
- tristate "EMI 6|2m USB Audio interface support"
|
||||
- depends on USB
|
||||
- ---help---
|
||||
- This driver loads firmware to Emagic EMI 6|2m low latency USB
|
||||
- Audio and Midi interface.
|
||||
-
|
||||
- After firmware load the device is handled with standard linux
|
||||
- USB Audio driver.
|
||||
-
|
||||
- This code is also available as a module ( = code which can be
|
||||
- inserted in and removed from the running kernel whenever you want).
|
||||
- The module will be called audio. If you want to compile it as a
|
||||
- module, say M here and read <file:Documentation/kbuild/modules.txt>.
|
||||
-
|
||||
-config USB_EMI26
|
||||
- tristate "EMI 2|6 USB Audio interface support"
|
||||
- depends on USB
|
||||
- ---help---
|
||||
- This driver loads firmware to Emagic EMI 2|6 low latency USB
|
||||
- Audio interface.
|
||||
-
|
||||
- After firmware load the device is handled with standard linux
|
||||
- USB Audio driver.
|
||||
-
|
||||
- To compile this driver as a module, choose M here: the
|
||||
- module will be called emi26.
|
||||
-
|
||||
config USB_ADUTUX
|
||||
tristate "ADU devices from Ontrak Control Systems"
|
||||
depends on USB
|
||||
diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
|
||||
--- a/drivers/usb/misc/Makefile 2007-02-04 19:44:54.000000000 +0100
|
||||
+++ b/drivers/usb/misc/Makefile 2007-02-05 16:45:42.000000000 +0100
|
||||
@@ -9,8 +9,6 @@
|
||||
obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o
|
||||
obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
|
||||
obj-$(CONFIG_USB_CYTHERM) += cytherm.o
|
||||
-obj-$(CONFIG_USB_EMI26) += emi26.o
|
||||
-obj-$(CONFIG_USB_EMI62) += emi62.o
|
||||
obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o
|
||||
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
|
||||
obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
|
||||
index 43d6db6..61c13e3 100644
|
||||
--- a/drivers/usb/serial/Kconfig
|
||||
+++ b/drivers/usb/serial/Kconfig
|
||||
@@ -290,6 +290,7 @@ config USB_SERIAL_KEYSPAN_PDA
|
||||
|
||||
config USB_SERIAL_KEYSPAN
|
||||
tristate "USB Keyspan USA-xxx Serial Driver"
|
||||
+ depends on BROKEN
|
||||
select USB_EZUSB
|
||||
---help---
|
||||
Say Y here if you want to use Keyspan USB to serial converter
|
||||
@@ -302,84 +303,6 @@ config USB_SERIAL_KEYSPAN
|
||||
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"
|
||||
---help---
|
||||
Loading…
Reference in New Issue