remove usb patches in mainline

13 files changed, 0 insertions, 517 deletions

diff --git a/usb/usb-add-new-itegno-usb-cdma-1x-card-support-for-pl2303.patch b/usb/usb-add-new-itegno-usb-cdma-1x-card-support-for-pl2303.patch
deleted file mode 100644
index 6b37ac8f95b2e..0000000000000
--- a/usb/usb-add-new-itegno-usb-cdma-1x-card-support-for-pl2303.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From wangjun1974@gmail.com Wed Apr 19 01:32:21 2006
-From: Wang Jun <wangjun1974@gmail.com>
-Subject: USB: add new iTegno usb CDMA 1x card support for pl2303
-To: gregkh@suse.de, juwang@novell.com
-Date: Wed, 19 Apr 2006 16:32:07 +0800
-Message-Id: <1145435527.11330.17.camel@sled10.site>
-
-Add new iTegno usb CDMA 1x card (usbid '0eba:2080') support to pl2303 driver
-
-Signed-off-by: Wang Jun <wangjun1974@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/usb/serial/pl2303.c |    1 +
- drivers/usb/serial/pl2303.h |    1 +
- 2 files changed, 2 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c
-+++ gregkh-2.6/drivers/usb/serial/pl2303.c
-@@ -61,6 +61,7 @@ static struct usb_device_id id_table [] 
- 	{ USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
- 	{ USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) },
- 	{ USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) },
-+	{ USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) },
- 	{ USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) },
- 	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) },
- 	{ USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) },
---- gregkh-2.6.orig/drivers/usb/serial/pl2303.h
-+++ gregkh-2.6/drivers/usb/serial/pl2303.h
-@@ -26,6 +26,7 @@
- 
- #define ITEGNO_VENDOR_ID	0x0eba
- #define ITEGNO_PRODUCT_ID	0x1080
-+#define ITEGNO_PRODUCT_ID_2080	0x2080
- 
- #define MA620_VENDOR_ID		0x0df7
- #define MA620_PRODUCT_ID	0x0620
diff --git a/usb/usb-ftdi_sio-add-support-for-ask-rdr-400-series-card-reader.patch b/usb/usb-ftdi_sio-add-support-for-ask-rdr-400-series-card-reader.patch
deleted file mode 100644
index 36737e93438ab..0000000000000
--- a/usb/usb-ftdi_sio-add-support-for-ask-rdr-400-series-card-reader.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ian.abbott@mev.co.uk Wed Apr 12 07:21:09 2006
-Message-ID: <443D0CB3.5090506@mev.co.uk>
-Date: Wed, 12 Apr 2006 15:20:35 +0100
-From: Ian Abbott <abbotti@mev.co.uk>
-Cc: Greg KH <greg@kroah.com>, <adriano.couto@link.pt>
-Subject: USB: ftdi_sio: add support for ASK RDR 400 series card reader
-
-This patch adds support for an ASK RDR 400 series contactless card
-reader <http://www.ask.fr/uk/products_and_services/terminals.html> to
-the ftdi_sio driver's device ID table.  The product ID was supplied by
-Adriano Couto on the ftdi-usb-sio-devel list.
-
-Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c |    1 +
- drivers/usb/serial/ftdi_sio.h |    5 +++++
- 2 files changed, 6 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
-@@ -495,6 +495,7 @@ static struct usb_device_id id_table_com
- 	{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
- 	{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
- 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
- 	{ },					/* Optional parameter entry */
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
-@@ -156,6 +156,11 @@
- #define ICOM_ID1_PID            0x0004
- 
- /*
-+ * ASK.fr devices
-+ */
-+#define FTDI_ASK_RDR400_PID	0xC991	/* ASK RDR 400 series card reader */
-+
-+/*
-  * DSS-20 Sync Station for Sony Ericsson P800
-  */
-  
diff --git a/usb/usb-ftdi_sio-adds-support-for-iplus-device.patch b/usb/usb-ftdi_sio-adds-support-for-iplus-device.patch
deleted file mode 100644
index 8d76005f4097e..0000000000000
--- a/usb/usb-ftdi_sio-adds-support-for-iplus-device.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From lcapitulino@mandriva.com.br Tue Apr 11 11:52:58 2006
-Date: Tue, 11 Apr 2006 15:52:41 -0300
-From: "Luiz Fernando N. Capitulino" <lcapitulino@mandriva.com.br>
-To: Greg KH <gregkh@suse.de>
-Subject: USB: ftdi_sio: Adds support for iPlus device.
-Message-ID: <20060411155241.72242b56@doriath.conectiva>
-
-
-Adds support in ftdi_sio usbserial driver for USB modems sold by
-Plus GSM Company in Poland.
-
-Signed-off-by: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c |    1 +
- drivers/usb/serial/ftdi_sio.h |    3 +++
- 2 files changed, 4 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
-@@ -308,6 +308,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIR
- 
- static struct usb_device_id id_table_combined [] = {
- 	{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) },
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
-@@ -39,6 +39,9 @@
- /* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */
- #define FTDI_TTUSB_PID 0xFF20 /* Product Id */
- 
-+/* iPlus device */
-+#define FTDI_IPLUS_PID 0xD070 /* Product Id */
-+
- /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
- /* they use the ftdi chipset for the USB interface and the vendor id is the same */
- #define FTDI_XF_632_PID 0xFC08	/* 632: 16x2 Character Display */
diff --git a/usb/usb-ftdi_sio-vendor-code-for-rr-cirkits-locobuffer-usb.patch b/usb/usb-ftdi_sio-vendor-code-for-rr-cirkits-locobuffer-usb.patch
deleted file mode 100644
index ca71da2d50174..0000000000000
--- a/usb/usb-ftdi_sio-vendor-code-for-rr-cirkits-locobuffer-usb.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ndb@sns-usa.com Sun Apr  9 21:05:22 2006
-Date: Mon, 10 Apr 2006 00:05:09 -0400 (EDT)
-From: Nathan Bronson <ndb@sns-usa.com>
-To: gregkh@suse.de
-Cc: dick.bronson@rr-cirkits.com
-Subject: USB: ftdi_sio vendor code for RR-CirKits LocoBuffer USB
-Message-ID: <Pine.LNX.4.64.0604092332370.29414@ariel.sns-i>
-
-This patch adds recognition of the RR-CirKits LocoBuffer USB
-to the existing FTDI driver.  http://www.rr-cirkits.com
-
-Signed-off-by: Nathan Bronson <ngb@sns-usa.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c |    1 +
- drivers/usb/serial/ftdi_sio.h |    5 +++++
- 2 files changed, 6 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
-@@ -493,6 +493,7 @@ static struct usb_device_id id_table_com
- 	{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
- 	{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
- 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
- 	{ },					/* Optional parameter entry */
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
-@@ -400,6 +400,11 @@
- #define FTDI_WESTREX_MODEL_8900F_PID	0xDC01	/* Model 8900F */
- 
- /*
-+ * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com)
-+ */
-+#define FTDI_RRCIRKITS_LOCOBUFFER_PID	0xc7d0	/* LocoBuffer USB */
-+
-+/*
-  * Eclo (http://www.eclo.pt/) product IDs.
-  * PID 0xEA90 submitted by Martin Grill.
-  */
diff --git a/usb/usb-net2280-check-for-shared-irqs.patch b/usb/usb-net2280-check-for-shared-irqs.patch
deleted file mode 100644
index 55afbbce78827..0000000000000
--- a/usb/usb-net2280-check-for-shared-irqs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From stern@rowland.harvard.edu Fri Apr 14 13:44:21 2006
-Date: Fri, 14 Apr 2006 16:44:11 -0400 (EDT)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>, David Brownell <david-b@pacbell.net>
-Subject: USB: net2280: check for shared IRQs
-Message-ID: <Pine.LNX.4.44L0.0604141642030.5320-100000@iolanthe.rowland.org>
-
-This patch (as670) adds a check for whether a shared IRQ was actually
-generated by the net2280 device.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/net2280.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/gadget/net2280.c
-+++ gregkh-2.6/drivers/usb/gadget/net2280.c
-@@ -2742,6 +2742,10 @@ static irqreturn_t net2280_irq (int irq,
- {
- 	struct net2280		*dev = _dev;
- 
-+	/* shared interrupt, not ours */
-+	if (!(readl(&dev->regs->irqstat0) & (1 << INTA_ASSERTED)))
-+		return IRQ_NONE;
-+
- 	spin_lock (&dev->lock);
- 
- 	/* handle disconnect, dma, and more */
diff --git a/usb/usb-net2280-handle-stalls-for-0-length-control-in-requests.patch b/usb/usb-net2280-handle-stalls-for-0-length-control-in-requests.patch
deleted file mode 100644
index 953dfb54f9dfe..0000000000000
--- a/usb/usb-net2280-handle-stalls-for-0-length-control-in-requests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From stern@rowland.harvard.edu Fri Apr 14 13:40:07 2006
-Date: Fri, 14 Apr 2006 16:40:00 -0400 (EDT)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>, David Brownell <david-b@pacbell.net>
-cc: USB development list <linux-usb-devel@lists.sourceforge.net>
-Subject: USB: net2280: Handle STALLs for 0-length control-IN requests
-Message-ID: <Pine.LNX.4.44L0.0604141635240.5320-100000@iolanthe.rowland.org>
-
-This patch (as668) fixes a typo in net2280.  The handler for 0-length
-control-IN requests should check that the endpoint _isn't_ halted before
-sending a 0-length packet.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/net2280.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/usb/gadget/net2280.c
-+++ gregkh-2.6/drivers/usb/gadget/net2280.c
-@@ -2166,7 +2166,7 @@ static void handle_ep_small (struct net2
- 					ep->stopped = 1;
- 					set_halt (ep);
- 					mode = 2;
--				} else if (!req && ep->stopped)
-+				} else if (!req && !ep->stopped)
- 					write_fifo (ep, NULL);
- 			}
- 		} else {
diff --git a/usb/usb-net2280-send-0-length-packets-for-ep0.patch b/usb/usb-net2280-send-0-length-packets-for-ep0.patch
deleted file mode 100644
index 10be6dcb514f4..0000000000000
--- a/usb/usb-net2280-send-0-length-packets-for-ep0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From stern@rowland.harvard.edu Fri Apr 14 13:42:10 2006
-Date: Fri, 14 Apr 2006 16:42:03 -0400 (EDT)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>, David Brownell <david-b@pacbell.net>
-Subject: USB: net2280: send 0-length packets for ep0
-Message-ID: <Pine.LNX.4.44L0.0604141640010.5320-100000@iolanthe.rowland.org>
-
-This patch (as669) fixes a bug in the net2280 driver.  Now it will
-properly send zero-length packets on ep0 until the control status stage
-occurs.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/net2280.c |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/gadget/net2280.c
-+++ gregkh-2.6/drivers/usb/gadget/net2280.c
-@@ -2280,9 +2280,7 @@ static void handle_ep_small (struct net2
- 		/* if we wrote it all, we're usually done */
- 		if (req->req.actual == req->req.length) {
- 			if (ep->num == 0) {
--				/* wait for control status */
--				if (mode != 2)
--					req = NULL;
-+				/* send zlps until the status stage */
- 			} else if (!req->req.zero || len != ep->ep.maxpacket)
- 				mode = 2;
- 		}
diff --git a/usb/usb-net2280-set-driver-data-before-it-is-used.patch b/usb/usb-net2280-set-driver-data-before-it-is-used.patch
deleted file mode 100644
index 11e633f9ee09a..0000000000000
--- a/usb/usb-net2280-set-driver-data-before-it-is-used.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From stern@rowland.harvard.edu Fri Apr 14 13:46:29 2006
-Date: Fri, 14 Apr 2006 16:46:28 -0400 (EDT)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>, David Brownell <david-b@pacbell.net>
-Subject: USB: net2280: set driver data before it is used
-Message-ID: <Pine.LNX.4.44L0.0604141644120.5320-100000@iolanthe.rowland.org>
-
-This patch (as671) fixes a bug in the error pathway for the net2280
-probe routine.  A failure during probe will cause the driver to call
-pci_get_drvdata before the corresponding pci_set_drvdata has been set.
-The patch also does a kzalloc conversion.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/net2280.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/gadget/net2280.c
-+++ gregkh-2.6/drivers/usb/gadget/net2280.c
-@@ -2833,13 +2833,13 @@ static int net2280_probe (struct pci_dev
- 	}
- 
- 	/* alloc, and start init */
--	dev = kmalloc (sizeof *dev, SLAB_KERNEL);
-+	dev = kzalloc (sizeof *dev, SLAB_KERNEL);
- 	if (dev == NULL){
- 		retval = -ENOMEM;
- 		goto done;
- 	}
- 
--	memset (dev, 0, sizeof *dev);
-+	pci_set_drvdata (pdev, dev);
- 	spin_lock_init (&dev->lock);
- 	dev->pdev = pdev;
- 	dev->gadget.ops = &net2280_ops;
-@@ -2952,7 +2952,6 @@ static int net2280_probe (struct pci_dev
- 	dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff;
- 
- 	/* done */
--	pci_set_drvdata (pdev, dev);
- 	INFO (dev, "%s\n", driver_desc);
- 	INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",
- 			bufp, base, dev->chiprev);
diff --git a/usb/usb-overrun-in-option-card-usb-driver.patch b/usb/usb-overrun-in-option-card-usb-driver.patch
deleted file mode 100644
index 0070ec078a6f6..0000000000000
--- a/usb/usb-overrun-in-option-card-usb-driver.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From smurf@smurf.noris.de Mon Apr 10 20:01:56 2006
-Date: Tue, 11 Apr 2006 05:01:44 +0200
-To: Greg KH <gregkh@suse.de>
-Cc: akpm@osdl.org, torvalds@osdl.org
-Subject: USB: Overrun in option-card USB driver
-Message-ID: <20060411030144.GR18658@smurf.noris.de>
-Content-Disposition: inline
-From: smurf@smurf.noris.de
-
-Since the arrays are declared as in_urbs[N_IN_URB]
-and out_urbs[N_OUT_URB], both for loops go one
-over the end of the array. This fixes coverity id #555.
-
-Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
-Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -24,6 +24,7 @@
-                      coding style clean-up
-   2005-06-20  v0.4.1 add missing braces :-/
-                      killed end-of-line whitespace
-+  2006-04-10  v0.4.2 fixed two array overrun errors :-/
- 
-   Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
- 
-@@ -591,14 +592,14 @@ option_setup_urbs (struct usb_serial *se
- 	portdata = usb_get_serial_port_data(port);
- 
- 	/* Do indat endpoints first */
--	for (j = 0; j <= N_IN_URB; ++j) {
-+	for (j = 0; j < N_IN_URB; ++j) {
- 		portdata->in_urbs[j] = option_setup_urb (serial,
-                   port->bulk_in_endpointAddress, USB_DIR_IN, port,
-                   portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
- 	}
- 
- 	/* outdat endpoints */
--	for (j = 0; j <= N_OUT_URB; ++j) {
-+	for (j = 0; j < N_OUT_URB; ++j) {
- 		portdata->out_urbs[j] = option_setup_urb (serial,
-                   port->bulk_out_endpointAddress, USB_DIR_OUT, port,
-                   portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
--- 
-1.3-rc1.GIT
-
diff --git a/usb/usb-resource-leak-fix-for-whiteheat-driver.patch b/usb/usb-resource-leak-fix-for-whiteheat-driver.patch
deleted file mode 100644
index efa6b794d31a4..0000000000000
--- a/usb/usb-resource-leak-fix-for-whiteheat-driver.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From jesper.juhl@gmail.com Sun Apr 23 10:58:42 2006
-From: Jesper Juhl <jesper.juhl@gmail.com>
-To: linux-kernel@vger.kernel.org
-Subject: USB: Resource leak fix for whiteheat driver
-Date: Sun, 23 Apr 2006 19:59:23 +0200
-Cc: Greg Kroah-Hartman <greg@kroah.com>, Stuart MacDonald <stuartm@connecttech.com>, Jesper Juhl <jesper.juhl@gmail.com>
-Content-Disposition: inline
-Message-Id: <200604231959.23877.jesper.juhl@gmail.com>
-
-We may return from drivers/usb/serial/whiteheat.c::whiteheat_attach()
-without freeing `result' if we leave via the no_firmware: label.
-
-Spotted by the coverity checker as #670
-
-Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
- drivers/usb/serial/whiteheat.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/whiteheat.c
-+++ gregkh-2.6/drivers/usb/serial/whiteheat.c
-@@ -508,6 +508,7 @@ no_firmware:
- 	err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->description);
- 	err("%s: If the firmware is not running (status led not blinking)\n", serial->type->description);
- 	err("%s: please contact support@connecttech.com\n", serial->type->description);
-+	kfree(result);
- 	return -ENODEV;
- 
- no_command_private:
diff --git a/usb/usb-storage-atmel-unusual-dev-update.patch b/usb/usb-storage-atmel-unusual-dev-update.patch
deleted file mode 100644
index d299435072db8..0000000000000
--- a/usb/usb-storage-atmel-unusual-dev-update.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From phil@ipom.com Sun Apr 16 19:19:32 2006
-Message-ID: <4442FB2D.4010802@ipom.com>
-Date: Sun, 16 Apr 2006 19:19:25 -0700
-From: Phil Dibowitz <phil@ipom.com>
-To: Phil Dibowitz <phil@ipom.com>
-Cc: Olivier Blondeau <zeitoun@gmail.com>, Greg KH <greg@kroah.com>
-Subject: USB: storage: atmel unusual dev update
-
-
-From: Olivier Blondeau <zeitoun@gmail.com>
-
-
-Originally submitted by Olivier Blondeau <zeitoun@gmail.com>, with re-diffing
-by me. Adds a new atmel unusual_dev entry.
-
-Signed-off-by: Phil Dibowitz <phil@ipom.com>
-
----
-
-
----
- drivers/usb/storage/unusual_devs.h |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
-+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
-@@ -773,6 +773,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_FIX_CAPACITY ),
- 
-+/* Reported by Olivier Blondeau <zeitoun@gmail.com> */
-+UNUSUAL_DEV(  0x0727, 0x0306, 0x0100, 0x0100,
-+		"ATMEL",
-+		"SND1 Storage",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_IGNORE_RESIDUE),
-+
- /* Submitted by Roman Hodek <roman@hodek.net> */
- UNUSUAL_DEV(  0x0781, 0x0001, 0x0200, 0x0200,
- 		"Sandisk",
diff --git a/usb/usb-storage-unusual-devs-update.patch b/usb/usb-storage-unusual-devs-update.patch
deleted file mode 100644
index d335e837cfec2..0000000000000
--- a/usb/usb-storage-unusual-devs-update.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From linux-usb-devel-admin@lists.sourceforge.net Sun Apr 16 19:19:07 2006
-Message-ID: <4442FAFC.3070802@ipom.com>
-From: Phil Dibowitz <phil@ipom.com>
-To: Kenneth Crudup <kenny@panix.com>
-Cc: linux-usb-devel@lists.sourceforge.net
-Subject: USB: Storage: unusual devs update
-Date: Sun, 16 Apr 2006 19:18:36 -0700
-
-This patch removes the Protocol portion of the Iomega Click! device as it's not
-needed. Not-needed message reported by Kenneth Crudup <kenny@panix.com>
-
-Signed-off-by: Phil Dibowitz <phil@ipom.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
-
-
----
- drivers/usb/storage/unusual_devs.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
-+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
-@@ -411,7 +411,7 @@ UNUSUAL_DEV(  0x050d, 0x0115, 0x0133, 0x
- UNUSUAL_DEV(  0x0525, 0xa140, 0x0100, 0x0100,
- 		"Iomega",
- 		"USB Clik! 40",
--		US_SC_8070, US_PR_BULK, NULL,
-+		US_SC_8070, US_PR_DEVICE, NULL,
- 		US_FL_FIX_INQUIRY ),
- 
- /* Yakumo Mega Image 37
diff --git a/usb/usb-use-new-pci_class_serial_usb_-defines.patch b/usb/usb-use-new-pci_class_serial_usb_-defines.patch
deleted file mode 100644
index 47238adc9895e..0000000000000
--- a/usb/usb-use-new-pci_class_serial_usb_-defines.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From khali@linux-fr.org Sun Apr  9 11:07:51 2006
-Date: Sun, 9 Apr 2006 20:07:35 +0200
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <gregkh@suse.de>
-Subject: USB: Use new PCI_CLASS_SERIAL_USB_* defines
-Message-Id: <20060409200735.822a1c30.khali@linux-fr.org>
-
-We could use the recently added PCI_CLASS_SERIAL_USB_UHCI,
-PCI_CLASS_SERIAL_USB_OHCI and PCI_CLASS_SERIAL_USB_EHCI defines in
-more places, for slightly shorter and clearer code.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/powerpc/platforms/powermac/pci.c |    2 +-
- drivers/usb/host/ehci-pci.c           |    2 +-
- drivers/usb/host/ohci-pci.c           |    2 +-
- drivers/usb/host/uhci-hcd.c           |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
---- gregkh-2.6.orig/arch/powerpc/platforms/powermac/pci.c
-+++ gregkh-2.6/arch/powerpc/platforms/powermac/pci.c
-@@ -1098,7 +1098,7 @@ pmac_pci_enable_device_hook(struct pci_d
- 	 * (iBook second controller)
- 	 */
- 	if (dev->vendor == PCI_VENDOR_ID_APPLE
--	    && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10))
-+	    && dev->class == PCI_CLASS_SERIAL_USB_OHCI
- 	    && !node) {
- 		printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",
- 		       pci_name(dev));
---- gregkh-2.6.orig/drivers/usb/host/ehci-pci.c
-+++ gregkh-2.6/drivers/usb/host/ehci-pci.c
-@@ -350,7 +350,7 @@ static const struct hc_driver ehci_pci_h
- /* PCI driver selection metadata; PCI hotplugging uses this */
- static const struct pci_device_id pci_ids [] = { {
- 	/* handle any USB 2.0 EHCI controller */
--	PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x20), ~0),
-+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
- 	.driver_data =	(unsigned long) &ehci_pci_hc_driver,
- 	},
- 	{ /* end: all zeroes */ }
---- gregkh-2.6.orig/drivers/usb/host/ohci-pci.c
-+++ gregkh-2.6/drivers/usb/host/ohci-pci.c
-@@ -206,7 +206,7 @@ static const struct hc_driver ohci_pci_h
- 
- static const struct pci_device_id pci_ids [] = { {
- 	/* handle any USB OHCI controller */
--	PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0),
-+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
- 	.driver_data =	(unsigned long) &ohci_pci_hc_driver,
- 	}, { /* end: all zeroes */ }
- };
---- gregkh-2.6.orig/drivers/usb/host/uhci-hcd.c
-+++ gregkh-2.6/drivers/usb/host/uhci-hcd.c
-@@ -858,7 +858,7 @@ static const struct hc_driver uhci_drive
- 
- static const struct pci_device_id uhci_pci_ids[] = { {
- 	/* handle any USB UHCI controller */
--	PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x00), ~0),
-+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
- 	.driver_data =	(unsigned long) &uhci_driver,
- 	}, { /* end: all zeroes */ }
- };