From 9270a6d1ae159b3690d0b39237d28e068e1bc602 Mon Sep 17 00:00:00 2001 From: Krishna Yarlagadda Date: Fri, 9 Sep 2011 18:44:27 +0530 Subject: 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 Tested-by: Rohan Somvanshi --- arch/arm/mach-tegra/board-cardhu.c | 6 +++--- arch/arm/mach-tegra/board-enterprise.c | 6 +++--- arch/arm/mach-tegra/board-ventana.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'arch/arm') 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,11 +228,11 @@ 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", 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,11 +218,11 @@ 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", 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,11 +233,11 @@ 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", -- cgit v1.2.3