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:25 -0800 |
| commit | 2977388739076488db69f6190aff7f92c59746a2 (patch) | |
| tree | f7b3a52d52a9c1072e7bc899b2ade6672c416eb7 /arch/arm/mach-tegra/board-whistler-baseband.c | |
| parent | 21f16617317fa5f411759d6b2e5d69109c1249ce (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: Rb43ded0f5544dfa7875e1b99edfa67e63caaaaba
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler-baseband.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-baseband.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-baseband.c b/arch/arm/mach-tegra/board-whistler-baseband.c index c91089c01558..8909e61c512b 100644 --- a/arch/arm/mach-tegra/board-whistler-baseband.c +++ b/arch/arm/mach-tegra/board-whistler-baseband.c @@ -23,7 +23,7 @@ #include <linux/delay.h> #include <linux/gpio.h> #include <linux/err.h> -#include <linux/tegra_usb.h> +#include <linux/platform_data/tegra_usb.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/pinmux.h> |