diff options
| author | Jin Qian <jqian@nvidia.com> | 2011-01-04 12:30:16 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:49:00 -0700 |
| commit | a4695f44b16151a85a1ffcf79739862cf374995c (patch) | |
| tree | 90aa77a8b58089be978e998fc5433d1d04634c1a /drivers/usb | |
| parent | 5850dd7c9d873cd337ae341bb7cffcecd08c04f5 (diff) | |
Merge remote branch 'remotes/git-master/android-tegra-2.6.36' into 0104-merge
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/configs/tegra_whistler_android_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/board-ventana.h
arch/arm/mach-tegra/board-whistler-power.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/clock.h
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/include/mach/iomap.h
arch/arm/mach-tegra/irq.c
arch/arm/mach-tegra/spi_tegra_slave.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/arm/mach-tegra/tegra2_dvfs.c
arch/arm/tools/mach-types
drivers/crypto/tegra-aes.c
drivers/rtc/rtc-tegra.c
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/nvhost_acm.c
drivers/video/tegra/host/nvhost_channel.c
drivers/video/tegra/host/nvhost_intr.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_pcm.c
Original-Change-Id: If13d61cce097ee90892132e775c5ac805a1f91e0
Reviewed-on: http://git-master/r/14922
Tested-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Id331a2ef77522766e5b7f86131c6c981b37ba4c8
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 184c1783d6c7..458c3540bf76 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -293,7 +293,6 @@ static void tegra_ehci_restart(struct usb_hcd *hcd) } down_write(&ehci_cf_port_reset_rwsem); - hcd->state = HC_STATE_RUNNING; ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag); /* flush posted writes */ ehci_readl(ehci, &ehci->regs->command); |