[PATCH] USB: remove USB_SCANNER from the build

USB_SCANNER is obsolete, and it's now marked as BROKEN.

I there a good reason to keep it in the kernel?

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index fe2bcd611d6ab6c57ab5d0d2a484b1c8e03c70f9..e3866bac349402a78fb3eec8519adf7e21e40a7e 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -46,7 +46,6 @@ obj-$(CONFIG_USB_DC2XX)               += image/
 obj-$(CONFIG_USB_HPUSBSCSI)    += image/
 obj-$(CONFIG_USB_MDC800)       += image/
 obj-$(CONFIG_USB_MICROTEK)     += image/
-obj-$(CONFIG_USB_SCANNER)      += image/
 
 obj-$(CONFIG_USB_SERIAL)       += serial/
 

diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
index ee7d5995813aceb9dd37297c8b7ee6d7d9299fb5..0b0f80e4f9a798fafc6b27cce923658fe501a800 100644 (file)
--- a/drivers/usb/image/Kconfig
+++ b/drivers/usb/image/Kconfig
@@ -17,19 +17,6 @@ config USB_MDC800
          To compile this driver as a module, choose M here: the
          module will be called mdc800.
 
-config USB_SCANNER
-       tristate "USB Scanner support (OBSOLETE)"
-       depends on USB && BROKEN
-       help
-         Say Y here if you want to connect a USB scanner to your computer's
-         USB port. Please read <file:Documentation/usb/scanner.txt> for more
-         information.
-
-         This driver has been obsoleted by support via libusb.
-
-         To compile this driver as a module, choose M here: the
-         module will be called scanner.
-
 config USB_MICROTEK
        tristate "Microtek X6USB scanner support"
        depends on USB && SCSI

diff --git a/drivers/usb/image/Makefile b/drivers/usb/image/Makefile
index 987ffdd8c52feec9e16b9b1d7ff56375546e5903..f01a73959c4e17983b8eb97510fdef032eafd837 100644 (file)
--- a/drivers/usb/image/Makefile
+++ b/drivers/usb/image/Makefile
@@ -5,4 +5,3 @@
 obj-$(CONFIG_USB_MDC800)       += mdc800.o
 obj-$(CONFIG_USB_HPUSBSCSI)    += hpusbscsi.o
 obj-$(CONFIG_USB_MICROTEK)     += microtek.o
-obj-$(CONFIG_USB_SCANNER)      += scanner.o