From 39a6c591dd848a1cdcac87347c4083cb91adc23a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 8 Mar 2011 00:19:31 -0800 Subject: [PATCH] merge: Update USB naming from upstream Change-Id: Ib6484eb5dbc4f05acb8db4762c0d156bb211b351 Reviewed-on: http://git-master/r/22166 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- arch/arm/configs/tegra_defconfig | 2 +- arch/arm/configs/tegra_whistler_android_defconfig | 2 +- drivers/usb/host/ehci-hcd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 0e04259896b9..23214a106068 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -276,7 +276,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_SUSPEND=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_TEGRA_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ACM=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index ffd94af81c2c..80b186c18728 100644 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -259,7 +259,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_SUSPEND=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_TEGRA_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ACM=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 66505a0d9703..36ec66bb995e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1197,7 +1197,7 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_atmel_driver #endif -#ifdef CONFIG_ARCH_TEGRA +#ifdef CONFIG_USB_EHCI_TEGRA #include "ehci-tegra.c" #define PLATFORM_DRIVER tegra_ehci_driver #endif -- 2.34.1