diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-03-08 00:21:01 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-03-09 18:58:05 -0800 |
| commit | 13b02f59ca1c86f3fec3c994d2c03ff52f7d8e7f (patch) | |
| tree | 184362385055c17bf3ef1885a020c7b9bb5ba2c9 /include | |
| parent | 1c38a5dd52803ad1bfac92128ee8c7495bbb6fb0 (diff) | |
merge: trivial updates resolved from upstream
* Move include/linux/tegra_usb.h to
include/linux/platform_data/tegra_usb.h
Change-Id: I5b7799c5af8029b15ad206978718b337afac8814
Reviewed-on: http://git-master/r/22165
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tegra_usb.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/include/linux/tegra_usb.h b/include/linux/tegra_usb.h deleted file mode 100644 index 6ae8c1e85229..000000000000 --- a/include/linux/tegra_usb.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2010 Google, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef _TEGRA_USB_H_ -#define _TEGRA_USB_H_ - -enum tegra_usb_operating_modes { - TEGRA_USB_DEVICE, - TEGRA_USB_HOST, - TEGRA_USB_OTG, -}; - -struct tegra_ehci_platform_data { - enum tegra_usb_operating_modes operating_mode; - /* power down the phy on bus suspend */ - int power_down_on_bus_suspend; - void *phy_config; -}; - -struct tegra_otg_platform_data { - struct platform_device* (*host_register)(void); - void (*host_unregister)(struct platform_device*); -}; - -#endif /* _TEGRA_USB_H_ */ |