From 76cc688d7d4503ea52ee5784ac1fe9f485d014f4 Mon Sep 17 00:00:00 2001 From: Kurt Yi Date: Wed, 11 Jan 2012 21:11:07 +0900 Subject: usb: host: tegra: replace CONFIG_USB_HOTPLUG to tegra_ehci_platform_data remove CONFIG_USB_HOTPLUG and add default_enable into tegra_ehci_platform_data We can't use different def_config because whistler & ventana source code is merged in same tree. BUG 923705 Change-Id: I3dfdf237d80865831264f02104c89c8088101905 Reviewed-on: http://git-master/r/74574 Signed-off-by: Kurt Yi Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/75888 Reviewed-by: Varun Colbert Tested-by: Varun Colbert Rebase-Id: Rf38d71cf8a898fefc9893eb8cf4c794282e9d1d9 --- arch/arm/mach-tegra/board-whistler.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-tegra/board-whistler.c') diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 89951768d17e..4ac9823c204d 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -474,16 +474,19 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { .phy_config = &utmi_phy_config[0], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, [1] = { .phy_config = &ulpi_phy_config, .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, [2] = { .phy_config = &utmi_phy_config[1], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, }; -- cgit v1.2.3