diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 03:32:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-02 03:32:45 +0200 |
| commit | ac9e7ab32fe42489808c8d9fc89ad413d2805766 (patch) | |
| tree | d5628b62e23fae6a0acd000a7bb16030c89f2073 /drivers/usb | |
| parent | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'cleanup/__iomem' into next/cleanup2 (diff) | |
| download | linux-ac9e7ab32fe42489808c8d9fc89ad413d2805766.tar.xz linux-ac9e7ab32fe42489808c8d9fc89ad413d2805766.zip | |
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc cleanups, part 2 from Olof Johansson:
"A shorter cleanup branch submitted separately due to dependencies with
some of the previous topics.
Major thing here is that the Broadcom bcmring platform is removed.
It's an SoC that's used on some stationary VoIP platforms, and is in
desperate need of some cleanup. Broadcom came back and suggested that
we just deprecate the platform for now, since they aren't going to
spend the resources needed on cleaning it up, and there are no users
of the platform directly from mainline."
Fix some conflicts due to BCM2835 getting added next to the removed
BCMRING, and removal of tegra files that had been converted to
devicetree.
* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
ARM: ux500: use __iomem pointers for MMIO
ARM: Remove mach-bcmring
ARM: clps711x: Remove board support for CEIVA
ARM: clps711x: Fix register definitions
ARM: clps711x: Fix lowlevel debug-macro
ARM: clps711x: Added simple clock framework
pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
ARM: tegra: delete unused headers
ARM: tegra: remove useless includes of <mach/*.h>
ARM: tegra: remove dead code
Diffstat (limited to 'drivers/usb')
| -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> |