refresh to 2.6.17-git2

8 files changed, 16 insertions, 16 deletions

diff --git a/usb/usb-class-device-to-device.patch b/usb/usb-class-device-to-device.patch
index a30eb50dccc77..6041dc3babe80 100644
--- a/usb/usb-class-device-to-device.patch
+++ b/usb/usb-class-device-to-device.patch
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  EXPORT_SYMBOL(usb_deregister_dev);
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -104,7 +104,8 @@ enum usb_interface_condition {
+@@ -103,7 +103,8 @@ enum usb_interface_condition {
   * @condition: binding state of the interface: not bound, binding
   *	(in probe()), bound to a driver, or unbinding (in disconnect())
   * @dev: driver model's view of this device
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   *
   * USB device drivers attach to interfaces on a physical device.  Each
   * interface encapsulates a single high level function, such as feeding
-@@ -144,7 +145,7 @@ struct usb_interface {
+@@ -143,7 +144,7 @@ struct usb_interface {
  					 * bound to */
  	enum usb_interface_condition condition;		/* state of binding */
  	struct device dev;		/* interface specific device info */
diff --git a/usb/usb-devio-class-to-device.patch b/usb/usb-devio-class-to-device.patch
index d9b4d3c6d4b6b..7722b3701b063 100644
--- a/usb/usb-devio-class-to-device.patch
+++ b/usb/usb-devio-class-to-device.patch
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static int usbdev_notify(struct notifier_block *self, unsigned long action,
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -361,7 +361,7 @@ struct usb_device {
+@@ -360,7 +360,7 @@ struct usb_device {
  	char *serial;			/* iSerialNumber string, if present */
  
  	struct list_head filelist;
diff --git a/usb/usb-endpoint-mess.patch b/usb/usb-endpoint-mess.patch
index 178b118546918..dea860943007c 100644
--- a/usb/usb-endpoint-mess.patch
+++ b/usb/usb-endpoint-mess.patch
@@ -360,7 +360,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -41,6 +41,8 @@ struct usb_driver;
+@@ -40,6 +40,8 @@ struct usb_driver;
   * Devices may also have class-specific or vendor-specific descriptors.
   */
  
@@ -369,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * struct usb_host_endpoint - host-side endpoint descriptor and queue
   * @desc: descriptor for this endpoint, wMaxPacketSize in native byteorder
-@@ -58,7 +60,7 @@ struct usb_host_endpoint {
+@@ -57,7 +59,7 @@ struct usb_host_endpoint {
  	struct usb_endpoint_descriptor	desc;
  	struct list_head		urb_list;
  	void				*hcpriv;
diff --git a/usb/usb-net2280-add-a-shutdown-routine.patch b/usb/usb-net2280-add-a-shutdown-routine.patch
index 0b3b8f6f51f66..5e1de49080c01 100644
--- a/usb/usb-net2280-add-a-shutdown-routine.patch
+++ b/usb/usb-net2280-add-a-shutdown-routine.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/gadget/net2280.c
 +++ gregkh-2.6/drivers/usb/gadget/net2280.c
-@@ -2972,6 +2972,22 @@ done:
+@@ -2966,6 +2966,22 @@ done:
  	return retval;
  }
  
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /*-------------------------------------------------------------------------*/
  
-@@ -3001,6 +3017,7 @@ static struct pci_driver net2280_pci_dri
+@@ -2995,6 +3011,7 @@ static struct pci_driver net2280_pci_dri
  
  	.probe =	net2280_probe,
  	.remove =	net2280_remove,
diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch
index ef507d3430163..fa7a146342bf3 100644
--- a/usb/usb-serial-dynamic-id.patch
+++ b/usb/usb-serial-dynamic-id.patch
@@ -284,7 +284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -422,6 +422,8 @@ extern void usb_driver_release_interface
+@@ -421,6 +421,8 @@ extern void usb_driver_release_interface
  			struct usb_interface *iface);
  const struct usb_device_id *usb_match_id(struct usb_interface *interface,
  					 const struct usb_device_id *id);
@@ -293,7 +293,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  extern struct usb_interface *usb_find_interface(struct usb_driver *drv,
  		int minor);
-@@ -536,11 +538,21 @@ static inline int usb_make_path (struct 
+@@ -535,11 +537,21 @@ static inline int usb_make_path (struct 
  
  /* ----------------------------------------------------------------------- */
  
@@ -315,7 +315,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * struct usb_driver - identifies USB driver to usbcore
   * @name: The driver name should be unique among USB drivers,
-@@ -1204,6 +1216,7 @@ usb_maxpacket(struct usb_device *udev, i
+@@ -1203,6 +1215,7 @@ usb_maxpacket(struct usb_device *udev, i
  extern void usb_register_notify(struct notifier_block *nb);
  extern void usb_unregister_notify(struct notifier_block *nb);
  
diff --git a/usb/usb-zd1201-cleanups.patch b/usb/usb-zd1201-cleanups.patch
index cfd5e653334c6..3f695c559b1b4 100644
--- a/usb/usb-zd1201-cleanups.patch
+++ b/usb/usb-zd1201-cleanups.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/usb/net/zd1201.c |   67 ++++++++++++++++++-----------------------------
  1 file changed, 26 insertions(+), 41 deletions(-)
 
---- gregkh-2.6.orig/drivers/usb/net/zd1201.c
-+++ gregkh-2.6/drivers/usb/net/zd1201.c
+--- gregkh-2.6.orig/drivers/net/wireless/zd1201.c
++++ gregkh-2.6/drivers/net/wireless/zd1201.c
 @@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table
  	{}
  };
diff --git a/usb/usb_interrupt_msg.patch b/usb/usb_interrupt_msg.patch
index a6a23f1e8bd82..aa4d409c8621d 100644
--- a/usb/usb_interrupt_msg.patch
+++ b/usb/usb_interrupt_msg.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   *	@pipe: endpoint "pipe" to send the message to
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -1009,6 +1009,8 @@ void usb_buffer_unmap_sg (struct usb_dev
+@@ -1008,6 +1008,8 @@ void usb_buffer_unmap_sg (struct usb_dev
  extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
  	__u8 request, __u8 requesttype, __u16 value, __u16 index,
  	void *data, __u16 size, int timeout);
diff --git a/usb/usbcore-port-reset-for-composite-devices.patch b/usb/usbcore-port-reset-for-composite-devices.patch
index 29a95ad337fe1..694c277630672 100644
--- a/usb/usbcore-port-reset-for-composite-devices.patch
+++ b/usb/usbcore-port-reset-for-composite-devices.patch
@@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -387,6 +387,8 @@ extern int usb_lock_device_for_reset(str
+@@ -386,6 +386,8 @@ extern int usb_lock_device_for_reset(str
  
  /* USB port reset for device reinitialization */
  extern int usb_reset_device(struct usb_device *dev);
@@ -154,7 +154,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
  
-@@ -555,6 +557,10 @@ struct usb_dynids {
+@@ -554,6 +556,10 @@ struct usb_dynids {
   *	do (or don't) show up otherwise in the filesystem.
   * @suspend: Called when the device is going to be suspended by the system.
   * @resume: Called when the device is being resumed by the system.
@@ -165,7 +165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   * @id_table: USB drivers use ID table to support hotplugging.
   *	Export this with MODULE_DEVICE_TABLE(usb,...).  This must be set
   *	or your driver's probe function will never get called.
-@@ -593,6 +599,9 @@ struct usb_driver {
+@@ -592,6 +598,9 @@ struct usb_driver {
  	int (*suspend) (struct usb_interface *intf, pm_message_t message);
  	int (*resume) (struct usb_interface *intf);