diff options
| author |   Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
| commit | fef40b2369a4ececa16b4d02b625e45252fe5d0a (patch) | |
| tree | 22445e45f0882630e410b89e2a26fd3e9ba9c30b /arch/arm/mach-tegra/devices.c | |
| parent | Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2 (diff) | |
| parent | usb: otg: mxs-phy: Fix mx23 operation (diff) | |
| download | linux-dev-fef40b2369a4ececa16b4d02b625e45252fe5d0a.tar.xz linux-dev-fef40b2369a4ececa16b4d02b625e45252fe5d0a.zip | |
Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index c70e65ffa36b..d8ab76276397 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -27,7 +27,7 @@ #include <mach/irqs.h> #include <mach/iomap.h> #include <mach/dma.h> -#include <mach/usb_phy.h> +#include <linux/usb/tegra_usb_phy.h> #include "gpio-names.h" #include "devices.h" |