diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-03-08 00:21:01 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:14 -0800 |
| commit | f542cf148b193b63b56835cf0deb1563f0a9b1a6 (patch) | |
| tree | 307f70a8e1ec030fd1616b44c3210f8a467e42b5 /arch/arm/mach-tegra/board-ventana.c | |
| parent | 4845b50da676d4eb82085735626bba7d10a921ab (diff) | |
merge: trivial updates resolved from upstream
* Move include/linux/tegra_usb.h to
include/linux/platform_data/tegra_usb.h
Original-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>
Rebase-Id: R485fae56c9a87d884107877b3bffecf64f6c542c
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 5d141e378ac6..639ca7725b51 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -33,7 +33,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/mfd/tps6586x.h> #include <linux/memblock.h> |