diff options
| author | Erik Gilling <konkers@android.com> | 2010-12-14 18:10:08 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2010-12-14 18:10:32 -0800 |
| commit | 8afb3d34090820f4128e6e2182a7231423c47b28 (patch) | |
| tree | 50e8e872e086e3753cc49f17e8ebf2ebb4565ec1 /include | |
| parent | 2da4db5bffe757188b0a06235e5e68505a5c20c4 (diff) | |
| parent | a05f03bf6ece7619877d6b3ccfbc7597f6df7b40 (diff) | |
Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/composite.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index f491e48b21e6..cb28d4302781 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -357,9 +357,13 @@ struct usb_composite_dev { /* protects at least deactivation count */ spinlock_t lock; - struct switch_dev sdev; - /* used by usb_composite_force_reset to avoid signalling switch changes */ - bool mute_switch; + /* switch indicating connected/disconnected state */ + struct switch_dev sw_connected; + /* switch indicating current configuration */ + struct switch_dev sw_config; + /* current connected state for sw_connected */ + bool connected; + struct work_struct switch_work; }; |