added usb makefile debug patch, and refreshed the rest.

9 files changed, 588 insertions, 43 deletions

diff --git a/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch b/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch
index 750971d7cb80c0..648a2b8adbca9b 100644
--- a/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch
+++ b/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/usb/core/message.c
 +++ gregkh-2.6/drivers/usb/core/message.c
-@@ -637,8 +637,8 @@ int usb_get_descriptor(struct usb_device
+@@ -630,8 +630,8 @@ int usb_get_descriptor(struct usb_device
   * Returns the number of bytes received on success, or else the status code
   * returned by the underlying usb_control_msg() call.
   */
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	int i;
  	int result;
-@@ -1488,7 +1488,6 @@ EXPORT_SYMBOL(usb_sg_wait);
+@@ -1481,7 +1481,6 @@ EXPORT_SYMBOL(usb_sg_wait);
  // synchronous control message convenience routines
  EXPORT_SYMBOL(usb_get_descriptor);
  EXPORT_SYMBOL(usb_get_status);
diff --git a/usb/usb-eagle-and-adi-930-usb-adsl-modem-driver.patch b/usb/usb-eagle-and-adi-930-usb-adsl-modem-driver.patch
index ae173a9554a1f6..ac8c77d3175398 100644
--- a/usb/usb-eagle-and-adi-930-usb-adsl-modem-driver.patch
+++ b/usb/usb-eagle-and-adi-930-usb-adsl-modem-driver.patch
@@ -80,13 +80,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	depends on USB_ATM
 --- gregkh-2.6.orig/drivers/usb/atm/Makefile
 +++ gregkh-2.6/drivers/usb/atm/Makefile
-@@ -4,5 +4,6 @@
+@@ -4,6 +4,7 @@
  
  obj-$(CONFIG_USB_CXACRU)	+= cxacru.o
  obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o
 +obj-$(CONFIG_USB_UEAGLEATM)	+= ueagle-atm.o
  obj-$(CONFIG_USB_ATM)		+= usbatm.o
  obj-$(CONFIG_USB_XUSBATM)	+= xusbatm.o
+ 
 --- /dev/null
 +++ gregkh-2.6/drivers/usb/atm/ueagle-atm.c
 @@ -0,0 +1,1813 @@
diff --git a/usb/usb-ehci-updates.patch b/usb/usb-ehci-updates.patch
index ea97b7624e1049..30ee0a501989b4 100644
--- a/usb/usb-ehci-updates.patch
+++ b/usb/usb-ehci-updates.patch
@@ -190,7 +190,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   		/* at least some APM implementations will try to deliver
 --- gregkh-2.6.orig/drivers/usb/core/hub.c
 +++ gregkh-2.6/drivers/usb/core/hub.c
-@@ -1674,7 +1674,6 @@ int usb_suspend_device(struct usb_device
+@@ -1669,7 +1669,6 @@ int usb_suspend_device(struct usb_device
  	return 0;
  #endif
  }
diff --git a/usb/usb-gotemp.patch b/usb/usb-gotemp.patch
index f40965e16d220a..8c0d2d3bbd63e4 100644
--- a/usb/usb-gotemp.patch
+++ b/usb/usb-gotemp.patch
@@ -1,8 +1,8 @@
  drivers/usb/Makefile      |    1 
  drivers/usb/misc/Kconfig  |   10 +
- drivers/usb/misc/Makefile |    3 
- drivers/usb/misc/gotemp.c |  296 ++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 309 insertions(+), 1 deletion(-)
+ drivers/usb/misc/Makefile |    1 
+ drivers/usb/misc/gotemp.c |  293 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 305 insertions(+)
 
 ---
 --- gregkh-2.6.orig/drivers/usb/misc/Kconfig
@@ -34,16 +34,9 @@
  obj-$(CONFIG_USB_IDMOUSE)	+= idmouse.o
  obj-$(CONFIG_USB_LCD)		+= usblcd.o
  obj-$(CONFIG_USB_LD)		+= ldusb.o
-@@ -18,4 +19,4 @@ obj-$(CONFIG_USB_RIO500)	+= rio500.o
- obj-$(CONFIG_USB_TEST)		+= usbtest.o
- obj-$(CONFIG_USB_USS720)	+= uss720.o
- 
--obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/
-\ No newline at end of file
-+obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/
 --- /dev/null
 +++ gregkh-2.6/drivers/usb/misc/gotemp.c
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,293 @@
 +/*
 + * USB GoTemp driver
 + *
@@ -56,9 +49,6 @@
 + */
 +
 +#include <linux/config.h>
-+#ifdef CONFIG_USB_DEBUG
-+	#define DEBUG	1
-+#endif
 +#include <linux/kernel.h>
 +#include <linux/errno.h>
 +#include <linux/init.h>
diff --git a/usb/usb-makefile-debug.patch b/usb/usb-makefile-debug.patch
new file mode 100644
index 00000000000000..d473a992c6a8ef
--- /dev/null
+++ b/usb/usb-makefile-debug.patch
@@ -0,0 +1,554 @@
+From foo@baz.org Wed Nov 16 13:31:19 2005
+Date: Wed, 16 Nov 2005 13:41:28 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: move CONFIG_USB_DEBUG checks into the Makefile
+
+This lets us remove a lot of code in the drivers that were all checking
+the same thing.  It also found some bugs in a few of the drivers, which
+has been fixed up.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/atm/Makefile           |    4 ++++
+ drivers/usb/atm/usbatm.h           |    5 -----
+ drivers/usb/core/Makefile          |    4 ++++
+ drivers/usb/core/buffer.c          |    8 --------
+ drivers/usb/core/config.c          |    5 -----
+ drivers/usb/core/file.c            |    6 ------
+ drivers/usb/core/hcd-pci.c         |    7 -------
+ drivers/usb/core/hcd.c             |    5 -----
+ drivers/usb/core/hub.c             |    5 -----
+ drivers/usb/core/message.c         |    7 -------
+ drivers/usb/core/notify.c          |    6 ------
+ drivers/usb/core/sysfs.c           |    7 -------
+ drivers/usb/core/urb.c             |    6 ------
+ drivers/usb/core/usb.c             |    7 -------
+ drivers/usb/input/Makefile         |    4 ++++
+ drivers/usb/input/itmtouch.c       |    7 -------
+ drivers/usb/input/keyspan_remote.c |    5 +++--
+ drivers/usb/input/mtouchusb.c      |    7 -------
+ drivers/usb/input/pid.c            |    2 --
+ drivers/usb/input/touchkitusb.c    |    4 ----
+ drivers/usb/misc/Makefile          |    6 +++++-
+ drivers/usb/misc/auerswald.c       |    1 -
+ drivers/usb/misc/phidgetservo.c    |    3 ---
+ drivers/usb/misc/rio500.c          |    2 +-
+ drivers/usb/misc/usbled.c          |    3 ---
+ drivers/usb/misc/usbtest.c         |    3 ---
+ drivers/usb/misc/uss720.c          |    2 --
+ drivers/usb/net/Makefile           |    4 ++++
+ drivers/usb/net/asix.c             |    3 ---
+ drivers/usb/net/cdc_ether.c        |    3 ---
+ drivers/usb/net/cdc_subset.c       |    3 ---
+ drivers/usb/net/gl620a.c           |    3 ---
+ drivers/usb/net/net1080.c          |    3 ---
+ drivers/usb/net/pegasus.c          |    2 --
+ drivers/usb/net/plusb.c            |    3 ---
+ drivers/usb/net/rndis_host.c       |    3 ---
+ drivers/usb/net/usbnet.c           |    3 ---
+ drivers/usb/net/zaurus.c           |    3 ---
+ 38 files changed, 25 insertions(+), 139 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/core/Makefile
++++ gregkh-2.6/drivers/usb/core/Makefile
+@@ -14,3 +14,7 @@ ifeq ($(CONFIG_USB_DEVICEFS),y)
+ endif
+ 
+ obj-$(CONFIG_USB)	+= usbcore.o
++
++ifeq ($(CONFIG_USB_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+--- gregkh-2.6.orig/drivers/usb/core/buffer.c
++++ gregkh-2.6/drivers/usb/core/buffer.c
+@@ -15,14 +15,6 @@
+ #include <asm/scatterlist.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/dmapool.h>
+-
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/usb.h>
+ #include "hcd.h"
+ 
+--- gregkh-2.6.orig/drivers/usb/core/config.c
++++ gregkh-2.6/drivers/usb/core/config.c
+@@ -1,9 +1,4 @@
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-#define DEBUG
+-#endif
+-
+ #include <linux/usb.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/core/file.c
++++ gregkh-2.6/drivers/usb/core/file.c
+@@ -19,12 +19,6 @@
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include <linux/errno.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+ #include <linux/usb.h>
+ 
+ #include "usb.h"
+--- gregkh-2.6.orig/drivers/usb/core/hcd-pci.c
++++ gregkh-2.6/drivers/usb/core/hcd-pci.c
+@@ -17,13 +17,6 @@
+  */
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+--- gregkh-2.6.orig/drivers/usb/core/hcd.c
++++ gregkh-2.6/drivers/usb/core/hcd.c
+@@ -23,11 +23,6 @@
+  */
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-#define DEBUG
+-#endif
+-
+ #include <linux/module.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+--- gregkh-2.6.orig/drivers/usb/core/hub.c
++++ gregkh-2.6/drivers/usb/core/hub.c
+@@ -9,11 +9,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/module.h>
+--- gregkh-2.6.orig/drivers/usb/core/message.c
++++ gregkh-2.6/drivers/usb/core/message.c
+@@ -3,13 +3,6 @@
+  */
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/pci.h>	/* for scatterlist macros */
+ #include <linux/usb.h>
+ #include <linux/module.h>
+--- gregkh-2.6.orig/drivers/usb/core/notify.c
++++ gregkh-2.6/drivers/usb/core/notify.c
+@@ -12,13 +12,7 @@
+ #include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/notifier.h>
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+ #include <linux/usb.h>
+-
+ #include "usb.h"
+ 
+ 
+--- gregkh-2.6.orig/drivers/usb/core/sysfs.c
++++ gregkh-2.6/drivers/usb/core/sysfs.c
+@@ -12,14 +12,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/kernel.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+ #include <linux/usb.h>
+-
+ #include "usb.h"
+ 
+ /* endpoint stuff */
+--- gregkh-2.6.orig/drivers/usb/core/urb.c
++++ gregkh-2.6/drivers/usb/core/urb.c
+@@ -4,12 +4,6 @@
+ #include <linux/bitops.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+ #include <linux/usb.h>
+ #include "hcd.h"
+ 
+--- gregkh-2.6.orig/drivers/usb/core/usb.c
++++ gregkh-2.6/drivers/usb/core/usb.c
+@@ -22,13 +22,6 @@
+  */
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/bitops.h>
+--- gregkh-2.6.orig/drivers/usb/net/Makefile
++++ gregkh-2.6/drivers/usb/net/Makefile
+@@ -16,3 +16,7 @@ obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_
+ obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
+ obj-$(CONFIG_USB_USBNET)	+= usbnet.o
+ obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
++
++ifeq ($(CONFIG_USB_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+--- gregkh-2.6.orig/drivers/usb/net/asix.c
++++ gregkh-2.6/drivers/usb/net/asix.c
+@@ -23,9 +23,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+ #include <linux/sched.h>
+--- gregkh-2.6.orig/drivers/usb/net/cdc_ether.c
++++ gregkh-2.6/drivers/usb/net/cdc_ether.c
+@@ -21,9 +21,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/cdc_subset.c
++++ gregkh-2.6/drivers/usb/net/cdc_subset.c
+@@ -18,9 +18,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+ #include <linux/sched.h>
+--- gregkh-2.6.orig/drivers/usb/net/gl620a.c
++++ gregkh-2.6/drivers/usb/net/gl620a.c
+@@ -22,9 +22,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/net1080.c
++++ gregkh-2.6/drivers/usb/net/net1080.c
+@@ -21,9 +21,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/pegasus.c
++++ gregkh-2.6/drivers/usb/net/pegasus.c
+@@ -28,8 +28,6 @@
+  * 			is out of the interrupt routine.
+  */
+ 
+-#undef	DEBUG
+-
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/plusb.c
++++ gregkh-2.6/drivers/usb/net/plusb.c
+@@ -21,9 +21,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/rndis_host.c
++++ gregkh-2.6/drivers/usb/net/rndis_host.c
+@@ -21,9 +21,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/usbnet.c
++++ gregkh-2.6/drivers/usb/net/usbnet.c
+@@ -34,9 +34,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/net/zaurus.c
++++ gregkh-2.6/drivers/usb/net/zaurus.c
+@@ -21,9 +21,6 @@
+ // #define	VERBOSE			// more; success messages
+ 
+ #include <linux/config.h>
+-#ifdef	CONFIG_USB_DEBUG
+-#   define DEBUG
+-#endif
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/input/Makefile
++++ gregkh-2.6/drivers/usb/input/Makefile
+@@ -42,3 +42,7 @@ obj-$(CONFIG_USB_ACECAD)	+= acecad.o
+ obj-$(CONFIG_USB_YEALINK)	+= yealink.o
+ obj-$(CONFIG_USB_XPAD)		+= xpad.o
+ obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o
++
++ifeq ($(CONFIG_USB_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+--- gregkh-2.6.orig/drivers/usb/input/itmtouch.c
++++ gregkh-2.6/drivers/usb/input/itmtouch.c
+@@ -40,13 +40,6 @@
+  *****************************************************************************/
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/input.h>
+--- gregkh-2.6.orig/drivers/usb/input/mtouchusb.c
++++ gregkh-2.6/drivers/usb/input/mtouchusb.c
+@@ -40,13 +40,6 @@
+  *****************************************************************************/
+ 
+ #include <linux/config.h>
+-
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG
+-#else
+-	#undef DEBUG
+-#endif
+-
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/input.h>
+--- gregkh-2.6.orig/drivers/usb/input/touchkitusb.c
++++ gregkh-2.6/drivers/usb/input/touchkitusb.c
+@@ -30,10 +30,6 @@
+ #include <linux/input.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+-
+-#if !defined(DEBUG) && defined(CONFIG_USB_DEBUG)
+-#define DEBUG
+-#endif
+ #include <linux/usb.h>
+ #include <linux/usb_input.h>
+ 
+--- gregkh-2.6.orig/drivers/usb/input/pid.c
++++ gregkh-2.6/drivers/usb/input/pid.c
+@@ -37,8 +37,6 @@
+ #include "hid.h"
+ #include "pid.h"
+ 
+-#define DEBUG
+-
+ #define CHECK_OWNERSHIP(i, hid_pid)	\
+ 	((i) < FF_EFFECTS_MAX && i >= 0 && \
+ 	test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \
+--- gregkh-2.6.orig/drivers/usb/input/keyspan_remote.c
++++ gregkh-2.6/drivers/usb/input/keyspan_remote.c
+@@ -160,7 +160,8 @@ static int keyspan_load_tester(struct us
+ 	 * though so it's not too big a deal
+ 	 */
+ 	if (dev->data.pos >= dev->data.len) {
+-		dev_dbg(&dev->udev, "%s - Error ran out of data. pos: %d, len: %d\n",
++		dev_dbg(&dev->udev->dev,
++			"%s - Error ran out of data. pos: %d, len: %d\n",
+ 			__FUNCTION__, dev->data.pos, dev->data.len);
+ 		return -1;
+ 	}
+@@ -306,7 +307,7 @@ static void keyspan_check_data(struct us
+ 			err("Bad message recieved, no stop bit found.\n");
+ 		}
+ 
+-		dev_dbg(&remote->udev,
++		dev_dbg(&remote->udev->dev,
+ 			"%s found valid message: system: %d, button: %d, toggle: %d\n",
+ 			__FUNCTION__, message.system, message.button, message.toggle);
+ 
+--- gregkh-2.6.orig/drivers/usb/misc/Makefile
++++ gregkh-2.6/drivers/usb/misc/Makefile
+@@ -18,4 +18,8 @@ obj-$(CONFIG_USB_RIO500)	+= rio500.o
+ obj-$(CONFIG_USB_TEST)		+= usbtest.o
+ obj-$(CONFIG_USB_USS720)	+= uss720.o
+ 
+-obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/
+\ No newline at end of file
++obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/
++
++ifeq ($(CONFIG_USB_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+--- gregkh-2.6.orig/drivers/usb/misc/phidgetservo.c
++++ gregkh-2.6/drivers/usb/misc/phidgetservo.c
+@@ -26,9 +26,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#ifdef CONFIG_USB_DEBUG
+-#define DEBUG	1
+-#endif
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/misc/usbled.c
++++ gregkh-2.6/drivers/usb/misc/usbled.c
+@@ -10,9 +10,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#ifdef CONFIG_USB_DEBUG
+-	#define DEBUG	1
+-#endif
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/misc/usbtest.c
++++ gregkh-2.6/drivers/usb/misc/usbtest.c
+@@ -1,7 +1,4 @@
+ #include <linux/config.h>
+-#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG)
+-#   define DEBUG
+-#endif
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+--- gregkh-2.6.orig/drivers/usb/misc/auerswald.c
++++ gregkh-2.6/drivers/usb/misc/auerswald.c
+@@ -30,7 +30,6 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/wait.h>
+-#undef DEBUG   		/* include debug macros until it's done	*/
+ #include <linux/usb.h>
+ 
+ /*-------------------------------------------------------------------*/
+--- gregkh-2.6.orig/drivers/usb/misc/rio500.c
++++ gregkh-2.6/drivers/usb/misc/rio500.c
+@@ -393,7 +393,7 @@ read_rio(struct file *file, char __user 
+ 				      ibuf, this_read, &partial,
+ 				      8000);
+ 
+-		dbg(KERN_DEBUG "read stats: result:%d this_read:%u partial:%u",
++		dbg("read stats: result:%d this_read:%u partial:%u",
+ 		       result, this_read, partial);
+ 
+ 		if (partial) {
+--- gregkh-2.6.orig/drivers/usb/misc/uss720.c
++++ gregkh-2.6/drivers/usb/misc/uss720.c
+@@ -41,8 +41,6 @@
+ 
+ /*****************************************************************************/
+ 
+-#define DEBUG
+-
+ #include <linux/module.h>
+ #include <linux/socket.h>
+ #include <linux/parport.h>
+--- gregkh-2.6.orig/drivers/usb/atm/Makefile
++++ gregkh-2.6/drivers/usb/atm/Makefile
+@@ -6,3 +6,7 @@ obj-$(CONFIG_USB_CXACRU)	+= cxacru.o
+ obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o
+ obj-$(CONFIG_USB_ATM)		+= usbatm.o
+ obj-$(CONFIG_USB_XUSBATM)	+= xusbatm.o
++
++ifeq ($(CONFIG_USB_DEBUG),y)
++EXTRA_CFLAGS += -DDEBUG
++endif
+--- gregkh-2.6.orig/drivers/usb/atm/usbatm.h
++++ gregkh-2.6/drivers/usb/atm/usbatm.h
+@@ -27,14 +27,9 @@
+ #include <linux/config.h>
+ 
+ /*
+-#define DEBUG
+ #define VERBOSE_DEBUG
+ */
+ 
+-#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG)
+-#	define DEBUG
+-#endif
+-
+ #include <asm/semaphore.h>
+ #include <linux/atm.h>
+ #include <linux/atmdev.h>
diff --git a/usb/usb-net-new-device-id-passed-through-module-parameter.patch b/usb/usb-net-new-device-id-passed-through-module-parameter.patch
index 5c6dff6cac5a45..16adef6df038b2 100644
--- a/usb/usb-net-new-device-id-passed-through-module-parameter.patch
+++ b/usb/usb-net-new-device-id-passed-through-module-parameter.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/net/pegasus.c
 +++ gregkh-2.6/drivers/usb/net/pegasus.c
-@@ -59,12 +59,14 @@ static const char driver_name[] = "pegas
+@@ -57,12 +57,14 @@ static const char driver_name[] = "pegas
  
  static int loopback = 0;
  static int mii_mode = 0;
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	{NULL, 0, 0, 0}
  };
  
-@@ -73,6 +75,7 @@ static struct usb_device_id pegasus_ids[
+@@ -71,6 +73,7 @@ static struct usb_device_id pegasus_ids[
  	{.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = vid, .idProduct = pid},
  #include "pegasus.h"
  #undef	PEGASUS_DEV
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	{}
  };
  
-@@ -81,8 +84,10 @@ MODULE_DESCRIPTION(DRIVER_DESC);
+@@ -79,8 +82,10 @@ MODULE_DESCRIPTION(DRIVER_DESC);
  MODULE_LICENSE("GPL");
  module_param(loopback, bool, 0);
  module_param(mii_mode, bool, 0);
@@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /* use ethtool to change the level for any given device */
  static int msg_level = -1;
-@@ -1412,9 +1417,42 @@ static struct usb_driver pegasus_driver 
+@@ -1410,9 +1415,42 @@ static struct usb_driver pegasus_driver 
  	.resume = pegasus_resume,
  };
  
diff --git a/usb/usb-net-removes-redundant-return.patch b/usb/usb-net-removes-redundant-return.patch
index 47e072fc1ce009..8f8f3453ca5b8e 100644
--- a/usb/usb-net-removes-redundant-return.patch
+++ b/usb/usb-net-removes-redundant-return.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/net/pegasus.c
 +++ gregkh-2.6/drivers/usb/net/pegasus.c
-@@ -47,7 +47,7 @@
+@@ -45,7 +45,7 @@
  /*
   * Version Information
   */
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
  #define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver"
  
-@@ -115,7 +115,7 @@ static void ctrl_callback(struct urb *ur
+@@ -113,7 +113,7 @@ static void ctrl_callback(struct urb *ur
  		break;
  	default:
  		if (netif_msg_drv(pegasus))
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  				__FUNCTION__, urb->status);
  	}
  	pegasus->flags &= ~ETH_REGS_CHANGED;
-@@ -310,9 +310,9 @@ static int read_mii_word(pegasus_t * peg
+@@ -308,9 +308,9 @@ static int read_mii_word(pegasus_t * peg
  	__le16 regdi;
  	int ret;
  
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	for (i = 0; i < REG_TIMEOUT; i++) {
  		ret = get_registers(pegasus, PhyCtrl, 1, data);
  		if (data[0] & PHY_DONE)
-@@ -321,12 +321,12 @@ static int read_mii_word(pegasus_t * peg
+@@ -319,12 +319,12 @@ static int read_mii_word(pegasus_t * peg
  	if (i < REG_TIMEOUT) {
  		ret = get_registers(pegasus, PhyData, 2, &regdi);
  		*regd = le16_to_cpu(regdi);
@@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static int mdio_read(struct net_device *dev, int phy_id, int loc)
-@@ -346,20 +346,20 @@ static int write_mii_word(pegasus_t * pe
+@@ -344,20 +344,20 @@ static int write_mii_word(pegasus_t * pe
  
  	data[1] = (u8) regd;
  	data[2] = (u8) (regd >> 8);
@@ -93,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
-@@ -376,9 +376,9 @@ static int read_eprom_word(pegasus_t * p
+@@ -374,9 +374,9 @@ static int read_eprom_word(pegasus_t * p
  	__le16 retdatai;
  	int ret;
  
@@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	for (i = 0; i < REG_TIMEOUT; i++) {
  		ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
-@@ -388,12 +388,12 @@ static int read_eprom_word(pegasus_t * p
+@@ -386,12 +386,12 @@ static int read_eprom_word(pegasus_t * p
  	if (i < REG_TIMEOUT) {
  		ret = get_registers(pegasus, EpromData, 2, &retdatai);
  		*retdata = le16_to_cpu(retdatai);
@@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  #ifdef	PEGASUS_WRITE_EEPROM
-@@ -402,8 +402,8 @@ static inline void enable_eprom_write(pe
+@@ -400,8 +400,8 @@ static inline void enable_eprom_write(pe
  	__u8 tmp;
  	int ret;
  
@@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static inline void disable_eprom_write(pegasus_t * pegasus)
-@@ -411,9 +411,9 @@ static inline void disable_eprom_write(p
+@@ -409,9 +409,9 @@ static inline void disable_eprom_write(p
  	__u8 tmp;
  	int ret;
  
@@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data)
-@@ -422,11 +422,11 @@ static int write_eprom_word(pegasus_t * 
+@@ -420,11 +420,11 @@ static int write_eprom_word(pegasus_t * 
  	__u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE };
  	int ret;
  
@@ -161,7 +161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	for (i = 0; i < REG_TIMEOUT; i++) {
  		ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
-@@ -435,10 +435,10 @@ static int write_eprom_word(pegasus_t * 
+@@ -433,10 +433,10 @@ static int write_eprom_word(pegasus_t * 
  	}
  	disable_eprom_write(pegasus);
  	if (i < REG_TIMEOUT)
@@ -174,7 +174,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  #endif				/* PEGASUS_WRITE_EEPROM */
  
-@@ -456,10 +456,9 @@ static inline void get_node_id(pegasus_t
+@@ -454,10 +454,9 @@ static inline void get_node_id(pegasus_t
  static void set_ethernet_addr(pegasus_t * pegasus)
  {
  	__u8 node_id[6];
@@ -186,7 +186,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	memcpy(pegasus->net->dev_addr, node_id, sizeof (node_id));
  }
  
-@@ -467,30 +466,29 @@ static inline int reset_mac(pegasus_t * 
+@@ -465,30 +464,29 @@ static inline int reset_mac(pegasus_t * 
  {
  	__u8 data = 0x8;
  	int i;
@@ -226,7 +226,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  	if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_ELCON) {
  		__u16 auxmode;
-@@ -529,7 +527,7 @@ static int enable_net_traffic(struct net
+@@ -527,7 +525,7 @@ static int enable_net_traffic(struct net
  		write_mii_word(pegasus, 0, 0x1b, auxmode | 4);
  	}
  
@@ -235,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static void fill_skb_pool(pegasus_t * pegasus)
-@@ -883,9 +881,8 @@ static struct net_device_stats *pegasus_
+@@ -881,9 +879,8 @@ static struct net_device_stats *pegasus_
  static inline void disable_net_traffic(pegasus_t * pegasus)
  {
  	int tmp = 0;
@@ -246,7 +246,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static inline void get_interrupt_interval(pegasus_t * pegasus)
-@@ -1208,18 +1205,17 @@ static __u8 mii_phy_probe(pegasus_t * pe
+@@ -1206,18 +1203,17 @@ static __u8 mii_phy_probe(pegasus_t * pe
  static inline void setup_pegasus_II(pegasus_t * pegasus)
  {
  	__u8 data = 0xa5;
@@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	if (data == 0xa5) {
  		pegasus->chip = 0x8513;
-@@ -1227,14 +1223,14 @@ static inline void setup_pegasus_II(pega
+@@ -1225,14 +1221,14 @@ static inline void setup_pegasus_II(pega
  		pegasus->chip = 0;
  	}
  
diff --git a/usb/usb-ohci-move-ppc-asic-tweaks-nearer-pci.patch b/usb/usb-ohci-move-ppc-asic-tweaks-nearer-pci.patch
index 66b0a83a3f94bb..c68b5145d445d0 100644
--- a/usb/usb-ohci-move-ppc-asic-tweaks-nearer-pci.patch
+++ b/usb/usb-ohci-move-ppc-asic-tweaks-nearer-pci.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/core/hcd-pci.c
 +++ gregkh-2.6/drivers/usb/core/hcd-pci.c
-@@ -27,9 +27,17 @@
+@@ -20,9 +20,17 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/pci.h>
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #include "usb.h"
  #include "hcd.h"
-@@ -284,8 +292,22 @@ int usb_hcd_pci_suspend (struct pci_dev 
+@@ -277,8 +285,22 @@ int usb_hcd_pci_suspend (struct pci_dev 
  	}
  
  done:
@@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return retval;
  }
  EXPORT_SYMBOL (usb_hcd_pci_suspend);
-@@ -308,6 +330,18 @@ int usb_hcd_pci_resume (struct pci_dev *
+@@ -301,6 +323,18 @@ int usb_hcd_pci_resume (struct pci_dev *
  		return 0;
  	}
  
diff --git a/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch b/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
index dfbee74dc8c398..537f30b6befeb0 100644
--- a/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
+++ b/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/core/hub.c
 +++ gregkh-2.6/drivers/usb/core/hub.c
-@@ -1044,6 +1044,39 @@ void usb_set_device_state(struct usb_dev
+@@ -1039,6 +1039,39 @@ void usb_set_device_state(struct usb_dev
  EXPORT_SYMBOL(usb_set_device_state);