diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/devs.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index c6900ca..26093c9 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -2792,8 +2792,10 @@ static struct platform_device *herring_devices[] __initdata = { #endif #ifdef CONFIG_USB_ANDROID &s3c_device_android_usb, +#ifdef CONFIG_USB_ANDROID_MASS_STORAGE &s3c_device_usb_mass_storage, #endif +#endif #ifdef CONFIG_S3C_DEV_HSMMC &s3c_device_hsmmc0, diff --git a/arch/arm/plat-s5p/devs.c b/arch/arm/plat-s5p/devs.c index 53de7cf..a3c4b5b 100644 --- a/arch/arm/plat-s5p/devs.c +++ b/arch/arm/plat-s5p/devs.c @@ -44,6 +44,9 @@ static char *usb_functions_ums[] = { "usb_mass_storage", }; +static char *usb_functions_adb[] = { + "adb", +}; static char *usb_functions_rndis[] = { "rndis", @@ -62,7 +65,9 @@ static char *usb_functions_all[] = { #ifdef CONFIG_USB_ANDROID_RNDIS "rndis", #endif +#ifdef CONFIG_USB_ANDROID_MASS_STORAGE "usb_mass_storage", +#endif "adb", #ifdef CONFIG_USB_ANDROID_ACM "acm", @@ -76,6 +81,11 @@ static struct android_usb_product usb_products[] = { }, { .product_id = S3C_ADB_PRODUCT_ID, + .num_functions = ARRAY_SIZE(usb_functions_adb), + .functions = usb_functions_adb, + }, + { + .product_id = S3C_ADB_PRODUCT_ID, .num_functions = ARRAY_SIZE(usb_functions_ums_adb), .functions = usb_functions_ums_adb, }, |