[kernel] r8114 - dists/sid/linux-2.6/debian/patches/debian/dfsg

[Frederik Schüler]

Author: fs
Date: Fri Jan  5 16:24:33 2007
New Revision: 8114

Added:
   dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
   dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
Modified:
   dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
Log:
Add removal patches for dgrs, emi62 and emi26


Added: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch	Fri Jan  5 16:24:33 2007
@@ -0,0 +1,36 @@
+diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
+--- a/drivers/net/Kconfig	2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/Kconfig	2007-01-05 15:13:26.000000000 +0000
+@@ -1460,21 +1460,6 @@
+ 	tristate "TOSHIBA TC35815 Ethernet support"
+ 	depends on NET_PCI && PCI && TOSHIBA_JMR3927
+ 
+-config DGRS
+-	tristate "Digi Intl. RightSwitch SE-X support"
+-	depends on NET_PCI && (PCI || EISA)
+-	---help---
+-	  This is support for the Digi International RightSwitch series of
+-	  PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
+-	  models.  If you have a network card of this type, say Y and read the
+-	  Ethernet-HOWTO, available from
+-	  <http://www.tldp.org/docs.html#howto>.  More specific
+-	  information is contained in <file:Documentation/networking/dgrs.txt>.
+-
+-	  To compile this driver as a module, choose M here and read
+-	  <file:Documentation/networking/net-modules.txt>.  The module
+-	  will be called dgrs.
+-
+ config EEPRO100
+ 	tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
+ 	depends on NET_PCI && PCI
+diff -ruN a/drivers/net/Makefile b/drivers/net/Makefile
+--- a/drivers/net/Makefile	2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/net/Makefile	2007-01-05 15:13:10.000000000 +0000
+@@ -38,7 +38,6 @@
+ 
+ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
+ 
+-obj-$(CONFIG_DGRS) += dgrs.o
+ obj-$(CONFIG_VORTEX) += 3c59x.o
+ obj-$(CONFIG_TYPHOON) += typhoon.o
+ obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o

Added: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch	Fri Jan  5 16:24:33 2007
@@ -0,0 +1,50 @@
+diff -ruN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
+--- a/drivers/usb/misc/Kconfig	2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/usb/misc/Kconfig	2007-01-05 15:22:14.000000000 +0000
+@@ -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 (EXPERIMENTAL)"
+ 	depends on USB && EXPERIMENTAL
+diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
+--- a/drivers/usb/misc/Makefile	2006-11-29 21:57:37.000000000 +0000
++++ b/drivers/usb/misc/Makefile	2007-01-05 15:22:03.000000000 +0000
+@@ -7,8 +7,6 @@
+ obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.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_LCD)		+= usblcd.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:24:33 2007
@@ -15,6 +15,8 @@
 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/smctr.h
 drivers/net/tokenring/smctr_firmware.h