summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrishna Yarlagadda <kyarlagadda@nvidia.com>2011-09-09 18:44:27 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2011-09-13 05:47:00 -0700
commit9270a6d1ae159b3690d0b39237d28e068e1bc602 (patch)
tree4af04d2d98745ddaf97d209af59906469f3e623f
parent58c1334c299ebfbf6c220d97394199ee32209bea (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 Change-Id: I70260b3e3036d627abcacf63df49728f2dd78841 Reviewed-on: http://git-master/r/51580 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c6
-rw-r--r--arch/arm/mach-tegra/board-enterprise.c6
-rw-r--r--arch/arm/mach-tegra/board-ventana.c6
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 ea9883c5c9f9..9d2c1762ff89 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.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"
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index a3e97b5747d5..5cf009f433b0 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -218,12 +218,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 dc804bca186d..98dbb481ac4c 100644
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.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"