xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Yah, it does work to merge. Knock wood.
This commit is contained in:
Linus Torvalds
2005-04-19 07:28:57 -07:00
parent c0698f2f6e e838a0d4d5
commit a9e4820c4c
62 changed files with 467 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/usb.h
View File

@@ -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);

2
include/linux/usb_cdc.h
View File

@@ -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));
/*-------------------------------------------------------------------------*/