From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 04:46:20 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120430~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e4451a0c5df8e337e5285a97fe924457ade45123;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'
---

e4451a0c5df8e337e5285a97fe924457ade45123
diff --cc drivers/usb/host/ehci-tegra.c
index 4c1eb61bc2fc,14532fe04f5e..a6e9b2cefee1
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -562,9 -577,12 +562,10 @@@ static const struct hc_driver tegra_ehc
  	.bus_suspend		= tegra_ehci_bus_suspend,
  	.bus_resume		= tegra_ehci_bus_resume,
  #endif
 -	.relinquish_port	= ehci_relinquish_port,
 -	.port_handed_over	= ehci_port_handed_over,
  };
  
- static int setup_vbus_gpio(struct platform_device *pdev)
+ static int setup_vbus_gpio(struct platform_device *pdev,
+ 			   struct tegra_ehci_platform_data *pdata)
  {
  	int err = 0;
  	int gpio;