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 /arch/arm/mach-tegra/board-ventana.c | |
| 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 'arch/arm/mach-tegra/board-ventana.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 381dafd5667a..f5d9f269ed88 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -32,7 +32,7 @@ #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/input.h> -#include <linux/tegra_usb.h> +#include <linux/platform_data/tegra_usb.h> #include <linux/usb/android_composite.h> #include <linux/mfd/tps6586x.h> #include <linux/memblock.h> |