diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-07 10:25:24 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-07 10:42:34 +0800 |
| commit | ebb76d62a59ddb38f8a1bf89ee298667a27296c8 (patch) | |
| tree | 43b2dfd258677c49210be4e3c0599975dd8b250d /include/linux | |
| parent | 33e30fb38c578c9db7400fd605ac84994a2a1dba (diff) | |
| parent | 7bd8af01b6e51cf86afd453777d095fd4991261b (diff) | |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into imx_3.10.y_android
Conflicts:
arch/arm/boot/dts/imx6sx.dtsi
drivers/usb/gadget/udc-core.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/gadget.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 28e99a181b35..25a5007f92e3 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -837,9 +837,6 @@ struct usb_gadget_driver { /* FIXME support safe rmmod */ struct device_driver driver; - - bool attached; - struct list_head list; }; |