2.6.16-rc3-git3 refresh

10 files changed, 0 insertions, 542 deletions

diff --git a/usb/usb-add-new-device-ids-to-ldusb.patch b/usb/usb-add-new-device-ids-to-ldusb.patch
deleted file mode 100644
index 0aa07409a8607..0000000000000
--- a/usb/usb-add-new-device-ids-to-ldusb.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From mhund@ld-didactic.de Thu Feb  2 00:36:49 2006
-Message-ID: <43E1C49B.9070705@ld-didactic.de>
-Date: Thu, 02 Feb 2006 09:36:43 +0100
-From: Michael Hund <mhund@ld-didactic.de>
-To: gregkh@suse.de, "Hund, Dr. Michael" <MHund@ld-didactic.de>
-Subject: USB: add new device ids to ldusb
-
-Signed-off-by: Michael Hund <mhund@ld-didactic.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/input/hid-core.c |   50 +++++++++++++++++++++----------------
- drivers/usb/misc/ldusb.c     |   57 ++++++++++++++++++++++++-------------------
- 2 files changed, 60 insertions(+), 47 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/input/hid-core.c
-+++ gregkh-2.6/drivers/usb/input/hid-core.c
-@@ -1435,17 +1435,20 @@ void hid_init_reports(struct hid_device 
- #define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004
- 
- #define USB_VENDOR_ID_LD		0x0f11
--#define USB_DEVICE_ID_CASSY		0x1000
--#define USB_DEVICE_ID_POCKETCASSY	0x1010
--#define USB_DEVICE_ID_MOBILECASSY	0x1020
--#define USB_DEVICE_ID_JWM		0x1080
--#define USB_DEVICE_ID_DMMP		0x1081
--#define USB_DEVICE_ID_UMIP		0x1090
--#define USB_DEVICE_ID_VIDEOCOM		0x1200
--#define USB_DEVICE_ID_COM3LAB		0x2000
--#define USB_DEVICE_ID_TELEPORT		0x2010
--#define USB_DEVICE_ID_NETWORKANALYSER	0x2020
--#define USB_DEVICE_ID_POWERCONTROL	0x2030
-+#define USB_DEVICE_ID_LD_CASSY		0x1000
-+#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010
-+#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020
-+#define USB_DEVICE_ID_LD_JWM		0x1080
-+#define USB_DEVICE_ID_LD_DMMP		0x1081
-+#define USB_DEVICE_ID_LD_UMIP		0x1090
-+#define USB_DEVICE_ID_LD_XRAY1		0x1100
-+#define USB_DEVICE_ID_LD_XRAY2		0x1101
-+#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200
-+#define USB_DEVICE_ID_LD_COM3LAB	0x2000
-+#define USB_DEVICE_ID_LD_TELEPORT	0x2010
-+#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020
-+#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030
-+#define USB_DEVICE_ID_LD_MACHINETEST	0x2040
- 
- #define USB_VENDOR_ID_APPLE		0x05ac
- #define USB_DEVICE_ID_APPLE_POWERMOUSE	0x0304
-@@ -1491,17 +1494,20 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER, HID_QUIRK_IGNORE },
--	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE },
---- gregkh-2.6.orig/drivers/usb/misc/ldusb.c
-+++ gregkh-2.6/drivers/usb/misc/ldusb.c
-@@ -24,6 +24,7 @@
-  * V0.1  (mh) Initial version
-  * V0.11 (mh) Added raw support for HID 1.0 devices (no interrupt out endpoint)
-  * V0.12 (mh) Added kmalloc check for string buffer
-+ * V0.13 (mh) Added support for LD X-Ray and Machine Test System
-  */
- 
- #include <linux/config.h>
-@@ -40,17 +41,20 @@
- 
- /* Define these values to match your devices */
- #define USB_VENDOR_ID_LD		0x0f11	/* USB Vendor ID of LD Didactic GmbH */
--#define USB_DEVICE_ID_CASSY		0x1000	/* USB Product ID for all CASSY-S modules */
--#define USB_DEVICE_ID_POCKETCASSY	0x1010	/* USB Product ID for Pocket-CASSY */
--#define USB_DEVICE_ID_MOBILECASSY	0x1020	/* USB Product ID for Mobile-CASSY */
--#define USB_DEVICE_ID_JWM		0x1080	/* USB Product ID for Joule and Wattmeter */
--#define USB_DEVICE_ID_DMMP		0x1081	/* USB Product ID for Digital Multimeter P (reserved) */
--#define USB_DEVICE_ID_UMIP		0x1090	/* USB Product ID for UMI P */
--#define USB_DEVICE_ID_VIDEOCOM		0x1200	/* USB Product ID for VideoCom */
--#define USB_DEVICE_ID_COM3LAB		0x2000	/* USB Product ID for COM3LAB */
--#define USB_DEVICE_ID_TELEPORT		0x2010	/* USB Product ID for Terminal Adapter */
--#define USB_DEVICE_ID_NETWORKANALYSER	0x2020	/* USB Product ID for Network Analyser */
--#define USB_DEVICE_ID_POWERCONTROL	0x2030	/* USB Product ID for Controlling device for Power Electronics */
-+#define USB_DEVICE_ID_LD_CASSY		0x1000	/* USB Product ID of CASSY-S */
-+#define USB_DEVICE_ID_LD_POCKETCASSY	0x1010	/* USB Product ID of Pocket-CASSY */
-+#define USB_DEVICE_ID_LD_MOBILECASSY	0x1020	/* USB Product ID of Mobile-CASSY */
-+#define USB_DEVICE_ID_LD_JWM		0x1080	/* USB Product ID of Joule and Wattmeter */
-+#define USB_DEVICE_ID_LD_DMMP		0x1081	/* USB Product ID of Digital Multimeter P (reserved) */
-+#define USB_DEVICE_ID_LD_UMIP		0x1090	/* USB Product ID of UMI P */
-+#define USB_DEVICE_ID_LD_XRAY1		0x1100	/* USB Product ID of X-Ray Apparatus */
-+#define USB_DEVICE_ID_LD_XRAY2		0x1101	/* USB Product ID of X-Ray Apparatus */
-+#define USB_DEVICE_ID_LD_VIDEOCOM	0x1200	/* USB Product ID of VideoCom */
-+#define USB_DEVICE_ID_LD_COM3LAB	0x2000	/* USB Product ID of COM3LAB */
-+#define USB_DEVICE_ID_LD_TELEPORT	0x2010	/* USB Product ID of Terminal Adapter */
-+#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020	/* USB Product ID of Network Analyser */
-+#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030	/* USB Product ID of Converter Control Unit */
-+#define USB_DEVICE_ID_LD_MACHINETEST	0x2040	/* USB Product ID of Machine Test System */
- 
- #define USB_VENDOR_ID_VERNIER		0x08f7
- #define USB_DEVICE_ID_VERNIER_LABPRO	0x0001
-@@ -67,17 +71,20 @@
- 
- /* table of devices that work with this driver */
- static struct usb_device_id ld_usb_table [] = {
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER) },
--	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },
-+	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },
- 	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
- 	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
- 	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
-@@ -85,7 +92,7 @@ static struct usb_device_id ld_usb_table
- 	{ }					/* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, ld_usb_table);
--MODULE_VERSION("V0.12");
-+MODULE_VERSION("V0.13");
- MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>");
- MODULE_DESCRIPTION("LD USB Driver");
- MODULE_LICENSE("GPL");
-@@ -632,8 +639,8 @@ static int ld_usb_probe(struct usb_inter
- 
- 	/* workaround for early firmware versions on fast computers */
- 	if ((le16_to_cpu(udev->descriptor.idVendor) == USB_VENDOR_ID_LD) &&
--	    ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_CASSY) ||
--	     (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_COM3LAB)) &&
-+	    ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_CASSY) ||
-+	     (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_COM3LAB)) &&
- 	    (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) {
- 		buffer = kmalloc(256, GFP_KERNEL);
- 		if (buffer == NULL) {
diff --git a/usb/usb-change-ldusb-s-experimental-state.patch b/usb/usb-change-ldusb-s-experimental-state.patch
deleted file mode 100644
index fc22ba93ca677..0000000000000
--- a/usb/usb-change-ldusb-s-experimental-state.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From mhund@ld-didactic.de Thu Feb  2 00:37:00 2006
-Message-ID: <43E1C4AE.6090801@ld-didactic.de>
-Date: Thu, 02 Feb 2006 09:37:02 +0100
-From: Michael Hund <mhund@ld-didactic.de>
-To: gregkh@suse.de, "Hund, Dr. Michael" <MHund@ld-didactic.de>
-Subject: USB: change ldusb's experimental state
-
-Signed-off-by: Michael Hund <mhund@ld-didactic.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/misc/Kconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/usb/misc/Kconfig
-+++ gregkh-2.6/drivers/usb/misc/Kconfig
-@@ -141,7 +141,7 @@ source "drivers/usb/misc/sisusbvga/Kconf
- 
- config USB_LD
- 	tristate "USB LD driver"
--	depends on USB && EXPERIMENTAL
-+	depends on USB
- 	help
- 	  This driver is for generic USB devices that use interrupt transfers,
- 	  like LD Didactic's USB devices.
diff --git a/usb/usb-fix-up-the-usb-early-handoff-logic-for-ehci.patch b/usb/usb-fix-up-the-usb-early-handoff-logic-for-ehci.patch
deleted file mode 100644
index 7f5b4fbb65072..0000000000000
--- a/usb/usb-fix-up-the-usb-early-handoff-logic-for-ehci.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From stern@rowland.harvard.edu  Thu Feb  9 21:48:03 2006
-Date: Thu, 9 Feb 2006 16:35:31 -0500 (EST)
-From: David Brownell <david-b@pacbell.net>
-To: Greg KH <greg@kroah.com>
-Cc: Alan Stern <stern@rowland.harvard.edu>
-Subject: USB: fix up the usb early handoff logic for EHCI
-Message-ID: <Pine.LNX.4.44L0.0602091633450.6892-100000@iolanthe.rowland.org>
-
-Disable some dubious "early" USB handoff code that allegedly works around bugs
-on some systems (we don't know which ones) but rudely breaks some others.
-
-Also make the kernel warnings reporting BIOS handoff problems be more useful,
-reporting the register whose value displays the trouble.
-
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/host/pci-quirks.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/host/pci-quirks.c
-+++ gregkh-2.6/drivers/usb/host/pci-quirks.c
-@@ -191,8 +191,9 @@ static void __devinit quirk_usb_handoff_
- 		}
- 		if (wait_time <= 0)
- 			printk(KERN_WARNING "%s %s: BIOS handoff "
--					"failed (BIOS bug ?)\n",
--					pdev->dev.bus_id, "OHCI");
-+					"failed (BIOS bug ?) %08x\n",
-+					pdev->dev.bus_id, "OHCI",
-+					readl(base + OHCI_CONTROL));
- 
- 		/* reset controller, preserving RWC */
- 		writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL);
-@@ -243,6 +244,12 @@ static void __devinit quirk_usb_disable_
- 				pr_debug("%s %s: BIOS handoff\n",
- 						pdev->dev.bus_id, "EHCI");
- 
-+#if 0
-+/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
-+ * but that seems dubious in general (the BIOS left it off intentionally)
-+ * and is known to prevent some systems from booting.  so we won't do this
-+ * unless maybe we can determine when we're on a system that needs SMI forced.
-+ */
- 				/* BIOS workaround (?): be sure the
- 				 * pre-Linux code receives the SMI
- 				 */
-@@ -252,6 +259,7 @@ static void __devinit quirk_usb_disable_
- 				pci_write_config_dword(pdev,
- 						offset + EHCI_USBLEGCTLSTS,
- 						val | EHCI_USBLEGCTLSTS_SOOE);
-+#endif
- 			}
- 
- 			/* always say Linux will own the hardware
-@@ -274,8 +282,8 @@ static void __devinit quirk_usb_disable_
- 				 * it down, and hope nothing goes too wrong
- 				 */
- 				printk(KERN_WARNING "%s %s: BIOS handoff "
--						"failed (BIOS bug ?)\n",
--					pdev->dev.bus_id, "EHCI");
-+						"failed (BIOS bug ?) %08x\n",
-+					pdev->dev.bus_id, "EHCI", cap);
- 				pci_write_config_byte(pdev, offset + 2, 0);
- 			}
- 
diff --git a/usb/usb-pl2303-leadtek-9531-gps-mouse.patch b/usb/usb-pl2303-leadtek-9531-gps-mouse.patch
deleted file mode 100644
index 14ced67c89085..0000000000000
--- a/usb/usb-pl2303-leadtek-9531-gps-mouse.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From christian.lindner@gmx.net Thu Feb  2 00:04:24 2006
-Message-ID: <43E0B35C.2080701@gmx.net>
-Date: Wed, 01 Feb 2006 14:10:52 +0100
-From: Christian Lindner <christian.lindner@gmx.net>
-To: Greg KH <gregkh@suse.de>
-Subject: USB: PL2303: Leadtek 9531 GPS-Mouse
-
-The patch adds the USB ID (0413:2101) for the Leadtek GPS-Mouse 9531 to
-the driver pl2303.
-
-Signed-off-by: Christian Lindner <christian.lindner@gmx.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/usb/serial/pl2303.c |    5 +++--
- drivers/usb/serial/pl2303.h |    4 ++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c
-+++ gregkh-2.6/drivers/usb/serial/pl2303.c
-@@ -73,9 +73,10 @@ static struct usb_device_id id_table [] 
- 	{ USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
- 	{ USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
- 	{ USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
--	{ USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) },
--	{ USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID ) },
-+	{ USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID) },
-+	{ USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) },
- 	{ USB_DEVICE(SAGEM_VENDOR_ID, SAGEM_PRODUCT_ID) },
-+	{ USB_DEVICE(LEADTEK_VENDOR_ID, LEADTEK_9531_PRODUCT_ID) },
- 	{ }					/* Terminating entry */
- };
- 
---- gregkh-2.6.orig/drivers/usb/serial/pl2303.h
-+++ gregkh-2.6/drivers/usb/serial/pl2303.h
-@@ -71,3 +71,7 @@
- 
- #define SAGEM_VENDOR_ID		0x079b
- #define SAGEM_PRODUCT_ID	0x0027
-+
-+/* Leadtek GPS 9531 (ID 0413:2101) */
-+#define LEADTEK_VENDOR_ID	0x0413
-+#define LEADTEK_9531_PRODUCT_ID	0x2101
diff --git a/usb/usb-sl811_cs-needs-platform_device-conversion-too.patch b/usb/usb-sl811_cs-needs-platform_device-conversion-too.patch
deleted file mode 100644
index 10b49a84ff1f9..0000000000000
--- a/usb/usb-sl811_cs-needs-platform_device-conversion-too.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From david-b@pacbell.net Mon Feb  6 12:16:36 2006
-From: David Brownell <david-b@pacbell.net>
-To: Greg KH <greg@kroah.com>
-Subject: USB: sl811_cs needs platform_device conversion too
-Date: Mon, 6 Feb 2006 12:15:15 -0800
-Cc: Russell King <rmk@arm.linux.org.uk>
-Message-Id: <200602061215.16016.david-b@pacbell.net>
-
-The switchover to "platform_driver" from "device_driver" missed
-one rather essential usage, which broke the sl811_cs driver ...
-this resolves the omission.
-
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/host/sl811_cs.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/host/sl811_cs.c
-+++ gregkh-2.6/drivers/usb/host/sl811_cs.c
-@@ -101,7 +101,7 @@ static struct resource resources[] = {
- 	},
- };
- 
--extern struct device_driver sl811h_driver;
-+extern struct platform_driver sl811h_driver;
- 
- static struct platform_device platform_dev = {
- 	.id			= -1,
-@@ -132,7 +132,7 @@ static int sl811_hc_init(struct device *
- 	 * initialized already because of the link order dependency created
- 	 * by referencing "sl811h_driver".
- 	 */
--	platform_dev.name = sl811h_driver.name;
-+	platform_dev.name = sl811h_driver.driver.name;
- 	return platform_device_register(&platform_dev);
- }
- 
diff --git a/usb/usb-storage-new-unusual_devs-entry.patch b/usb/usb-storage-new-unusual_devs-entry.patch
deleted file mode 100644
index 24736a4e01ea7..0000000000000
--- a/usb/usb-storage-new-unusual_devs-entry.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From stern@rowland.harvard.edu Thu Feb  2 06:52:59 2006
-Date: Thu, 2 Feb 2006 09:52:45 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Andrew Simmons <andrew.simmons@gmail.com>, Phil Dibowitz <phil@ipom.com>
-Subject: usb-storage: new unusual_devs entry
-Message-ID: <Pine.LNX.4.44L0.0602020950520.5177-100000@iolanthe.rowland.org>
-
-This patch (as631) for unusual_devs.h fixes bugzilla entry 5913.
-
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Phil Dibowitz <phil@ipom.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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
-@@ -1162,6 +1162,13 @@ UNUSUAL_DEV(  0x55aa, 0xa103, 0x0000, 0x
- 		US_FL_SINGLE_LUN),
- #endif
- 
-+/* Reported by Andrew Simmons <andrew.simmons@gmail.com> */
-+UNUSUAL_DEV(  0xed06, 0x4500, 0x0001, 0x0001,
-+		"DataStor",
-+		"USB4500 FW1.04",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_FIX_CAPACITY),
-+
- /* Control/Bulk transport for all SubClass values */
- USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR),
- USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR),
diff --git a/usb/usb-storage-unusual_devs-entry.patch b/usb/usb-storage-unusual_devs-entry.patch
deleted file mode 100644
index 17a8fe73c5394..0000000000000
--- a/usb/usb-storage-unusual_devs-entry.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From stern@rowland.harvard.edu Mon Jan 30 07:19:53 2006
-Date: Mon, 30 Jan 2006 10:19:43 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Jan De Luyck <lkml@kcore.org>, Phil Dibowitz <phil@ipom.com>
-Subject: [PATCH] usb-storage: unusual_devs entry
-Message-ID: <Pine.LNX.4.44L0.0601301017540.5105-100000@iolanthe.rowland.org>
-
-Here is a new entry for unusual_devs.h (as630).
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/storage/unusual_devs.h |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
-+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
-@@ -946,6 +946,12 @@ UNUSUAL_DEV(  0x084d, 0x0011, 0x0110, 0x
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_BULK32),
- 
-+/* Submitted by Jan De Luyck <lkml@kcore.org> */
-+UNUSUAL_DEV(  0x08bd, 0x1100, 0x0000, 0x0000,
-+		"CITIZEN",
-+		"X1DE-USB",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_SINGLE_LUN),
- 
- /* Entry needed for flags. Moreover, all devices with this ID use
-  * bulk-only transport, but _some_ falsely report Control/Bulk instead.
diff --git a/usb/usb-unusual-devs-bugfix.patch b/usb/usb-unusual-devs-bugfix.patch
deleted file mode 100644
index 569e0670bd42d..0000000000000
--- a/usb/usb-unusual-devs-bugfix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From phil@ipom.com  Mon Feb 13 20:26:09 2006
-Message-ID: <43F11D6E.4050805@ipom.com>
-Date: Mon, 13 Feb 2006 15:59:42 -0800
-From: Phil Dibowitz <phil@ipom.com>
-To: Greg KH <greg@kroah.com>, <bohdan.linda@gmail.com>
-Subject: USB: unusual-devs bugfix
-
-The following patch looks good to me. It adds an unusual_devs entry as
-well as fixing an ordering bug. Please apply.
-
-From: Bohdan Linda <bohdan.linda@gmail.com>
-Signed-off-by: Phil Dibowitz <phil@ipom.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/storage/unusual_devs.h |   25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
-+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
-@@ -134,6 +134,14 @@ UNUSUAL_DEV(  0x0436, 0x0005, 0x0100, 0x
-  		US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ),
- #endif
- 
-+/* Patch submitted by Daniel Drake <dsd@gentoo.org>
-+ * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */
-+UNUSUAL_DEV(  0x0451, 0x5416, 0x0100, 0x0100,
-+		"Neuros Audio",
-+		"USB 2.0 HD 2.5",
-+		US_SC_DEVICE, US_PR_BULK, NULL,
-+		US_FL_NEED_OVERRIDE ),
-+
- /*
-  * Pete Zaitcev <zaitcev@yahoo.com>, from Patrick C. F. Ernzer, bz#162559.
-  * The key does not actually break, but it returns zero sense which
-@@ -144,13 +152,16 @@ UNUSUAL_DEV(  0x0457, 0x0150, 0x0100, 0x
- 		"USB Mass Storage Device",
- 		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
- 
--/* Patch submitted by Daniel Drake <dsd@gentoo.org>
-- * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */
--UNUSUAL_DEV(  0x0451, 0x5416, 0x0100, 0x0100,
--		"Neuros Audio",
--		"USB 2.0 HD 2.5",
--		US_SC_DEVICE, US_PR_BULK, NULL,
--		US_FL_NEED_OVERRIDE ),
-+/*
-+* Bohdan Linda <bohdan.linda@gmail.com>
-+* 1GB USB sticks MyFlash High Speed. I have restricted
-+* the revision to my model only
-+*/
-+UNUSUAL_DEV(  0x0457, 0x0151, 0x0100, 0x0100,
-+                "USB 2.0",
-+                "Flash Disk",
-+                US_SC_DEVICE, US_PR_DEVICE, NULL,
-+                US_FL_NOT_LOCKABLE ),
- 
- UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
- 		"Rio",
diff --git a/usb/usb-unusual_devs.h-entry-iaudio-m5.patch b/usb/usb-unusual_devs.h-entry-iaudio-m5.patch
deleted file mode 100644
index 2b3123003ae32..0000000000000
--- a/usb/usb-unusual_devs.h-entry-iaudio-m5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From stern@rowland.harvard.edu  Mon Feb 13 20:25:50 2006
-Date: Mon, 13 Feb 2006 10:16:04 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Phil Dibowitz <phil@ipom.com>
-Subject: USB: unusual_devs.h entry: iAUDIO M5
-Message-ID: <Pine.LNX.4.44L0.0602131015220.5121-100000@iolanthe.rowland.org>
-
-Another unusual_devs.h entry (as652).
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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
-@@ -1098,6 +1098,13 @@ UNUSUAL_DEV(  0x0dda, 0x0301, 0x0012, 0x
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_IGNORE_RESIDUE ),
- 
-+/* Reported by Jim McCloskey <mcclosk@ucsc.edu> */
-+UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100,
-+		"Cowon Systems",
-+		"iAUDIO M5",
-+		US_SC_DEVICE, US_PR_BULK, NULL,
-+		0 ),
-+
- /* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */
- UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300,
- 		"USB",
diff --git a/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch b/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch
deleted file mode 100644
index df8bb91a53fe9..0000000000000
--- a/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From stern@rowland.harvard.edu  Mon Feb 13 20:25:28 2006
-Date: Mon, 13 Feb 2006 10:15:22 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Phil Dibowitz <phil@ipom.com>
-Subject: USB: unusual_devs.h entry: TrekStor i.Beat
-Message-ID: <Pine.LNX.4.44L0.0602131012430.5121-100000@iolanthe.rowland.org>
-
-A new unusual_devs.h entry (as651).
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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
-@@ -106,6 +106,13 @@ UNUSUAL_DEV(  0x0411, 0x001c, 0x0113, 0x
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
- 		US_FL_FIX_INQUIRY ),
- 
-+/* Reported by Christian Leber <christian@leber.de> */
-+UNUSUAL_DEV(  0x0419, 0xaaf5, 0x0100, 0x0100,
-+		"TrekStor",
-+		"i.Beat 115 2.0",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ),
-+
- /* Reported by Stefan Werner <dustbln@gmx.de> */
- UNUSUAL_DEV(  0x0419, 0xaaf6, 0x0100, 0x0100,
- 		"TrekStor",