diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:45 -0800 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /drivers/usb/phy/tegra_usb_phy.c | |
| parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
| parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) | |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/usb/phy/tegra_usb_phy.c')
| -rw-r--r-- | drivers/usb/phy/tegra_usb_phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c index 987116f9efcd..9d13c81754e0 100644 --- a/drivers/usb/phy/tegra_usb_phy.c +++ b/drivers/usb/phy/tegra_usb_phy.c @@ -29,7 +29,9 @@ #include <linux/usb/ulpi.h> #include <asm/mach-types.h> #include <linux/usb/tegra_usb_phy.h> -#include <mach/iomap.h> + +#define TEGRA_USB_BASE 0xC5000000 +#define TEGRA_USB_SIZE SZ_16K #define ULPI_VIEWPORT 0x170 |