diff options
| author | Colin Cross <ccross@android.com> | 2011-02-12 14:13:19 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-02-12 14:13:19 -0800 |
| commit | 87666eb18a15ffecfbd6108a9e2cb0d54e33ec99 (patch) | |
| tree | ca3cdf277886299212f52471dcae6fa9b683802e /include | |
| parent | fd4194e5c3ab51f0eacdc115eeead02dbf8f4d88 (diff) | |
| parent | 1cd64ef5c1becb1c70c432bdcae98fdb686a8173 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/mmc.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/android_composite.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index a5d765c01281..5b35987e691b 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -267,7 +267,6 @@ struct _mmc_csd { #define EXT_CSD_SEC_ERASE_MULT 230 /* RO */ #define EXT_CSD_SEC_FEATURE_SUPPORT 231 /* RO */ #define EXT_CSD_TRIM_MULT 232 /* RO */ -#define EXT_CSD_BOOT_SIZE_MULTI 226 /* RO */ /* * EXT_CSD field definitions diff --git a/include/linux/usb/android_composite.h b/include/linux/usb/android_composite.h index 62e72e3bd2b6..7f9000711f4e 100644 --- a/include/linux/usb/android_composite.h +++ b/include/linux/usb/android_composite.h @@ -27,7 +27,12 @@ struct android_usb_function { }; struct android_usb_product { - /* Default product ID. */ + /* Vendor ID for this set of functions. + * Default vendor_id in platform data will be used if this is zero. + */ + __u16 vendor_id; + + /* Product ID for this set of functions. */ __u16 product_id; /* List of function names associated with this product. |