ChangeSet 1.1500.8.20, 2004/02/04 17:06:38-08:00, bunk@fs.tum.de

[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?


 drivers/usb/Makefile       |    1 -
 drivers/usb/image/Kconfig  |   13 -------------
 drivers/usb/image/Makefile |    1 -
 3 files changed, 15 deletions(-)


diff -Nru a/drivers/usb/Makefile b/drivers/usb/Makefile
--- a/drivers/usb/Makefile	Mon Feb  9 14:39:04 2004
+++ b/drivers/usb/Makefile	Mon Feb  9 14:39:04 2004
@@ -46,7 +46,6 @@
 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 -Nru a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
--- a/drivers/usb/image/Kconfig	Mon Feb  9 14:39:04 2004
+++ b/drivers/usb/image/Kconfig	Mon Feb  9 14:39:04 2004
@@ -17,19 +17,6 @@
 	  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 -Nru a/drivers/usb/image/Makefile b/drivers/usb/image/Makefile
--- a/drivers/usb/image/Makefile	Mon Feb  9 14:39:04 2004
+++ b/drivers/usb/image/Makefile	Mon Feb  9 14:39:04 2004
@@ -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