diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
| commit | 5d3a0a95868a9669816da193bb284121df9031c8 (patch) | |
| tree | 292ce2c9135bd7b524b4710cff9a174c2967d600 /drivers/usb/phy/tegra_usb_phy.c | |
| parent | 7e95c548818d2b311090848083277fb907cfb56d (diff) | |
| parent | b98138e00d96abc85b100c9b6886f105d9868ab5 (diff) | |
Merge branch 'next/cleanup2' into HEAD
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c
Diffstat (limited to 'drivers/usb/phy/tegra_usb_phy.c')
| -rw-r--r-- | drivers/usb/phy/tegra_usb_phy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c index 4739903245e8..987116f9efcd 100644 --- a/drivers/usb/phy/tegra_usb_phy.c +++ b/drivers/usb/phy/tegra_usb_phy.c @@ -28,7 +28,6 @@ #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> #include <asm/mach-types.h> -#include <mach/gpio-tegra.h> #include <linux/usb/tegra_usb_phy.h> #include <mach/iomap.h> |