Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/

Yah, it does work to merge. Knock wood.

2 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index c96728435935..41d1a644c9d4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -558,7 +558,7 @@ struct usb_driver {
 
         int (*ioctl) (struct usb_interface *intf, unsigned int code, void *buf);
 
-        int (*suspend) (struct usb_interface *intf, u32 state);
+        int (*suspend) (struct usb_interface *intf, pm_message_t message);
         int (*resume) (struct usb_interface *intf);
 
         const struct usb_device_id *id_table;
@@ -977,7 +977,7 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
         int timeout);
 
 /* selective suspend/resume */
-extern int usb_suspend_device(struct usb_device *dev, u32 state);
+extern int usb_suspend_device(struct usb_device *dev, pm_message_t message);
 extern int usb_resume_device(struct usb_device *dev);
 
 
diff --git a/include/linux/usb_cdc.h b/include/linux/usb_cdc.h
index 1b68c122279a..f22d6beecc73 100644
--- a/include/linux/usb_cdc.h
+++ b/include/linux/usb_cdc.h
@@ -114,7 +114,7 @@ struct usb_cdc_mdlm_detail_desc {
 
         /* type is associated with mdlm_desc.bGUID */
         __u8    bGuidDescriptorType;
-        __u8    bDetailData[];
+        __u8    bDetailData[0];
 } __attribute__ ((packed));
 
 /*-------------------------------------------------------------------------*/