diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-15 18:58:18 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-15 18:58:18 +0530 |
| commit | 51137becfb544f2569d6cc9130f395f7f1aef93c (patch) | |
| tree | 271b9e62d503bc9c9c5109a506029c5449317be7 /include | |
| parent | f22a0367722d2c24fee84dcb23dc47a042d42108 (diff) | |
| parent | 8afb3d34090820f4128e6e2182a7231423c47b28 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I84ac6254ede2e88e8141e6ffd630eb753d9b1d91
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; }; |