summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2010-12-10 10:01:59 +0530
committerNitin Kumbhar <nkumbhar@nvidia.com>2010-12-10 10:01:59 +0530
commit7adb08046b793f52749e2c54be2f7434196c32cf (patch)
tree300e8e2e5270708d1b23a438bba9844bacb58d54 /include
parent845c6e1d456c92e32ad79176d418c0d2592998d4 (diff)
parent42907f1736fe39cdf39b5f583fcd6b9e4e257b18 (diff)
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I1312ec33ba8bac38dc395d7d1a2f485b13d74c14
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/android_composite.h5
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);