diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 17:23:11 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 17:23:11 -0400 |
commit | 7e95c548818d2b311090848083277fb907cfb56d (patch) | |
tree | 86fecf07ae1f01ba8bac5969974a7915b738baee /arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | |
parent | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (diff) | |
parent | 99261fbad0a16f105b262d7525801697588ba526 (diff) |
Merge branch 'next/dt' into HEAD
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
Diffstat (limited to 'arch/arm/mach-msm/include/mach/msm_iomap-7x30.h')
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h index f944fe65a657..198202c267c8 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | |||
@@ -100,8 +100,4 @@ | |||
100 | #define MSM_HSUSB_PHYS 0xA3600000 | 100 | #define MSM_HSUSB_PHYS 0xA3600000 |
101 | #define MSM_HSUSB_SIZE SZ_1K | 101 | #define MSM_HSUSB_SIZE SZ_1K |
102 | 102 | ||
103 | #ifndef __ASSEMBLY__ | ||
104 | extern void msm_map_msm7x30_io(void); | ||
105 | #endif | ||
106 | |||
107 | #endif | 103 | #endif |