diff options
| author | Iliyan Malchev <malchev@google.com> | 2010-12-06 18:22:59 -0800 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2010-12-06 18:22:59 -0800 |
| commit | 8df654ec268e468cf5ee5736f576c9fdbe26c0c1 (patch) | |
| tree | 11dad4ebb72e2edc56d15717bbbf69983880772c /include | |
| parent | b41914227e944b49368b07b043cda35cd21eefea (diff) | |
| parent | 10a8f4d52e6260829374e304d091082bce5c2f7d (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/android_composite.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/usb/android_composite.h b/include/linux/usb/android_composite.h index ac09dcb71775..62e72e3bd2b6 100644 --- a/include/linux/usb/android_composite.h +++ b/include/linux/usb/android_composite.h @@ -88,6 +88,11 @@ struct usb_ether_platform_data { const char *vendorDescr; }; +/* Platform data for ACM driver. */ +struct acm_platform_data { + u8 num_inst; +}; + extern void android_register_function(struct android_usb_function *f); extern void android_enable_function(struct usb_function *f, int enable); |