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-8x50.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-8x50.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h index da77cc1d545d..0faa894729b7 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | |||
| @@ -122,8 +122,4 @@ | |||
| 122 | #define MSM_SDC4_PHYS 0xA0600000 | 122 | #define MSM_SDC4_PHYS 0xA0600000 |
| 123 | #define MSM_SDC4_SIZE SZ_4K | 123 | #define MSM_SDC4_SIZE SZ_4K |
| 124 | 124 | ||
| 125 | #ifndef __ASSEMBLY__ | ||
| 126 | extern void msm_map_qsd8x50_io(void); | ||
| 127 | #endif | ||
| 128 | |||
| 129 | #endif | 125 | #endif |