diff options
| author | Krishna Yarlagadda <kyarlagadda@nvidia.com> | 2011-09-09 18:44:27 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-28 17:40:30 -0700 |
| commit | 6149e1dadc86a6874d54ad6e9e30e81bf4db65a4 (patch) | |
| tree | b3e09a6c29292738c30cfe8d79d5aaea2d765c50 | |
| parent | e296047cb5e987bb6e99098f9750caafe9420e8b (diff) | |
ARM: tegra: change usb functions order
RNDIS should always be registered as first function in
list of usb functions available. Moving accessory function
down the order
Bug 874046
Reviewed-on: http://git-master/r/51580
(cherry picked from commit 9270a6d1ae159b3690d0b39237d28e068e1bc602)
Change-Id: I8206ba1366d5c137b0b626d4352a2373af6a1ee5
Reviewed-on: http://git-master/r/54950
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index cd840def7240..177d65c30b9a 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -233,12 +233,12 @@ static char *usb_functions_rndis[] = { "rndis" }; static char *usb_functions_rndis_adb[] = { "rndis", "adb" }; #endif static char *usb_functions_all[] = { -#ifdef CONFIG_USB_ANDROID_ACCESSORY - "accessory", -#endif #ifdef CONFIG_USB_ANDROID_RNDIS "rndis", #endif +#ifdef CONFIG_USB_ANDROID_ACCESSORY + "accessory", +#endif "mtp", "adb", "usb_mass_storage" diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index d1d17b5eedd8..2573daebe102 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -223,12 +223,12 @@ static char *usb_functions_accessory_adb[] = { "accessory", "adb" }; #endif static char *usb_functions_all[] = { -#ifdef CONFIG_USB_ANDROID_ACCESSORY - "accessory", -#endif #ifdef CONFIG_USB_ANDROID_RNDIS "rndis", #endif +#ifdef CONFIG_USB_ANDROID_ACCESSORY + "accessory", +#endif "mtp", "adb", "usb_mass_storage" diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 7fc00847851d..c4b8d692b9f3 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -228,12 +228,12 @@ static char *usb_functions_rndis[] = { "rndis" }; static char *usb_functions_rndis_adb[] = { "rndis", "adb" }; #endif static char *usb_functions_all[] = { -#ifdef CONFIG_USB_ANDROID_ACCESSORY - "accessory", -#endif #ifdef CONFIG_USB_ANDROID_RNDIS "rndis", #endif +#ifdef CONFIG_USB_ANDROID_ACCESSORY + "accessory", +#endif "mtp", "adb", "usb_mass_storage" |