diff -aurN a/arch/alpha/defconfig b/arch/alpha/defconfig --- a/arch/alpha/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/alpha/defconfig 2005-06-18 16:11:08.000000000 -0400 @@ -512,7 +512,6 @@ # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_CS89x0 is not set -# CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set # CONFIG_E100 is not set # CONFIG_LNE390 is not set @@ -533,7 +532,6 @@ # # Ethernet (1000 Mbit) # -# CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set # CONFIG_NS83820 is not set diff -aurN a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig --- a/arch/arm/configs/lpd7a404_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/arm/configs/lpd7a404_defconfig 2005-06-18 16:30:01.000000000 -0400 @@ -676,8 +676,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/i386/defconfig b/arch/i386/defconfig --- a/arch/i386/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/i386/defconfig 2005-06-18 16:22:33.000000000 -0400 @@ -624,7 +624,6 @@ # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_CS89x0 is not set -# CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set # CONFIG_E100 is not set # CONFIG_FEALNX is not set @@ -646,7 +645,6 @@ # # Ethernet (1000 Mbit) # -# CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set # CONFIG_NS83820 is not set @@ -1026,7 +1024,6 @@ # # USB Multimedia devices # -# CONFIG_USB_DABUSB is not set # # Video4Linux support is needed for USB Multimedia device support @@ -1054,8 +1051,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_TIGL is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set diff -aurN a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig --- a/arch/ia64/configs/zx1_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ia64/configs/zx1_defconfig 2005-06-18 16:27:49.000000000 -0400 @@ -1014,8 +1014,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/ia64/defconfig b/arch/ia64/defconfig --- a/arch/ia64/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ia64/defconfig 2005-06-18 16:28:03.000000000 -0400 @@ -482,7 +482,6 @@ # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set CONFIG_EEPRO100=m CONFIG_E100=m # CONFIG_FEALNX is not set @@ -500,7 +499,6 @@ # # Ethernet (1000 Mbit) # -# CONFIG_ACENIC is not set # CONFIG_DL2K is not set CONFIG_E1000=y # CONFIG_E1000_NAPI is not set @@ -879,7 +877,6 @@ # # USB Multimedia devices # -# CONFIG_USB_DABUSB is not set # # Video4Linux support is needed for USB Multimedia device support @@ -906,8 +903,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig --- a/arch/mips/configs/rm200_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/mips/configs/rm200_defconfig 2005-06-18 16:27:28.000000000 -0400 @@ -1098,8 +1098,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m diff -aurN a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig --- a/arch/ppc/configs/common_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc/configs/common_defconfig 2005-06-18 16:24:38.000000000 -0400 @@ -1213,8 +1213,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/ppc/configs/lopec_defconfig b/arch/ppc/configs/lopec_defconfig --- a/arch/ppc/configs/lopec_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc/configs/lopec_defconfig 2005-06-18 16:25:01.000000000 -0400 @@ -681,8 +681,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_TIGL is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set diff -aurN a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig --- a/arch/ppc/configs/pmac_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc/configs/pmac_defconfig 2005-06-18 16:25:19.000000000 -0400 @@ -1278,8 +1278,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/ppc/configs/sandpoint_defconfig b/arch/ppc/configs/sandpoint_defconfig --- a/arch/ppc/configs/sandpoint_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc/configs/sandpoint_defconfig 2005-06-18 16:24:50.000000000 -0400 @@ -600,8 +600,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_TIGL is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set diff -aurN a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig --- a/arch/ppc64/configs/g5_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc64/configs/g5_defconfig 2005-06-18 16:28:43.000000000 -0400 @@ -1059,8 +1059,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig --- a/arch/ppc64/configs/pSeries_defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc64/configs/pSeries_defconfig 2005-06-18 16:29:21.000000000 -0400 @@ -1014,8 +1014,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/ppc64/defconfig b/arch/ppc64/defconfig --- a/arch/ppc64/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/ppc64/defconfig 2005-06-18 16:29:36.000000000 -0400 @@ -591,7 +591,6 @@ # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=y # CONFIG_FEALNX is not set @@ -607,8 +606,6 @@ # # Ethernet (1000 Mbit) # -CONFIG_ACENIC=y -CONFIG_ACENIC_OMIT_TIGON_I=y # CONFIG_DL2K is not set CONFIG_E1000=y # CONFIG_E1000_NAPI is not set @@ -1040,7 +1037,6 @@ # # USB Multimedia devices # -# CONFIG_USB_DABUSB is not set # # Video4Linux support is needed for USB Multimedia device support @@ -1069,8 +1065,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/arch/sparc64/defconfig b/arch/sparc64/defconfig --- a/arch/sparc64/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/sparc64/defconfig 2005-06-18 16:23:32.000000000 -0400 @@ -904,7 +904,6 @@ CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m CONFIG_FORCEDETH=m -CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m CONFIG_FEALNX=m @@ -926,8 +925,6 @@ # # Ethernet (1000 Mbit) # -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y @@ -1723,7 +1720,6 @@ # # USB Multimedia devices # -# CONFIG_USB_DABUSB is not set # CONFIG_USB_VICAM is not set # CONFIG_USB_DSBR is not set # CONFIG_USB_IBMCAM is not set @@ -1817,8 +1813,6 @@ # # USB Miscellaneous drivers # -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m diff -aurN a/arch/x86_64/defconfig b/arch/x86_64/defconfig --- a/arch/x86_64/defconfig 2005-06-17 15:48:29.000000000 -0400 +++ b/arch/x86_64/defconfig 2005-06-18 16:31:01.000000000 -0400 @@ -530,7 +530,6 @@ # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_B44 is not set CONFIG_FORCEDETH=y -# CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=y # CONFIG_FEALNX is not set @@ -550,7 +549,6 @@ # # Ethernet (1000 Mbit) # -# CONFIG_ACENIC is not set # CONFIG_DL2K is not set CONFIG_E1000=y # CONFIG_E1000_NAPI is not set @@ -862,7 +860,6 @@ # # USB Multimedia devices # -# CONFIG_USB_DABUSB is not set # # Video4Linux support is needed for USB Multimedia device support @@ -890,8 +887,6 @@ # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set diff -aurN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig --- a/drivers/usb/misc/Kconfig 2005-06-18 11:23:01.000000000 -0400 +++ b/drivers/usb/misc/Kconfig 2005-06-18 16:31:32.000000000 -0400 @@ -4,19 +4,6 @@ comment "USB Miscellaneous drivers" depends on USB -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_AUERSWALD tristate "USB Auerswald ISDN support (EXPERIMENTAL)" depends on USB && EXPERIMENTAL --- linux-2.6.13/drivers/usb/misc/Makefile.orig 2005-08-06 11:56:51.000000000 +0200 +++ linux-2.6.13/drivers/usb/misc/Makefile 2005-08-06 11:58:37.000000000 +0200 @@ -5,7 +5,6 @@ obj-$(CONFIG_USB_AUERSWALD) += auerswald.o obj-$(CONFIG_USB_CYTHERM) += cytherm.o -obj-$(CONFIG_USB_EMI26) += emi26.o obj-$(CONFIG_USB_IDMOUSE) += idmouse.o obj-$(CONFIG_USB_LCD) += usblcd.o obj-$(CONFIG_USB_LD) += ldusb.o