[2.6 patch] remove USB_SCANNER

[Adrian Bunk]

On Mon, Feb 02, 2004 at 01:43:26PM -0800, Greg KH wrote:
> On Fri, Jan 30, 2004 at 04:06:33PM -0700, Tom Rini wrote:
> > 
> > Greg, I think this now makes 2 distinct bugs in the scanner kernel
> > driver.  Maybe it should be protected with a BROKEN:
> 
> Very good idea, I've applied this patch.

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

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

If not, please apply the patch below plus do a
  rm drivers/usb/image/scanner.{c,h}

> thanks,
> 
> greg k-h

cu
Adrian

--- linux-2.6.2-rc3-mm1/drivers/usb/Makefile.old	2004-02-05 01:27:52.000000000 +0100
+++ linux-2.6.2-rc3-mm1/drivers/usb/Makefile	2004-02-05 01:28:08.000000000 +0100
@@ -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/
 
--- linux-2.6.2-rc3-mm1/drivers/usb/image/Makefile.old	2004-02-05 01:27:52.000000000 +0100
+++ linux-2.6.2-rc3-mm1/drivers/usb/image/Makefile	2004-02-05 01:28:15.000000000 +0100
@@ -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
--- linux-2.6.2-rc3-mm1/drivers/usb/image/Kconfig.old	2004-02-05 01:27:52.000000000 +0100
+++ linux-2.6.2-rc3-mm1/drivers/usb/image/Kconfig	2004-02-05 01:28:21.000000000 +0100
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/