diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/mach-msm/board-msm7x27.c | |
| parent | bd1274dc005c2cee41771a7cc616f4709a6e6323 (diff) | |
| parent | b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 (diff) | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/mach-msm/board-msm7x27.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x27.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index e7a76eff57d9..08fcd40a8cbd 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c | |||
| @@ -132,7 +132,7 @@ static void __init msm7x2x_map_io(void) | |||
| 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") |
| 133 | #ifdef CONFIG_MSM_DEBUG_UART | 133 | #ifdef CONFIG_MSM_DEBUG_UART |
| 134 | #endif | 134 | #endif |
| 135 | .boot_params = PHYS_OFFSET + 0x100, | 135 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
| 136 | .map_io = msm7x2x_map_io, | 136 | .map_io = msm7x2x_map_io, |
| 137 | .init_irq = msm7x2x_init_irq, | 137 | .init_irq = msm7x2x_init_irq, |
| 138 | .init_machine = msm7x2x_init, | 138 | .init_machine = msm7x2x_init, |
| @@ -142,7 +142,7 @@ MACHINE_END | |||
| 142 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | 142 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") |
| 143 | #ifdef CONFIG_MSM_DEBUG_UART | 143 | #ifdef CONFIG_MSM_DEBUG_UART |
| 144 | #endif | 144 | #endif |
| 145 | .boot_params = PHYS_OFFSET + 0x100, | 145 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
| 146 | .map_io = msm7x2x_map_io, | 146 | .map_io = msm7x2x_map_io, |
| 147 | .init_irq = msm7x2x_init_irq, | 147 | .init_irq = msm7x2x_init_irq, |
| 148 | .init_machine = msm7x2x_init, | 148 | .init_machine = msm7x2x_init, |
| @@ -152,7 +152,7 @@ MACHINE_END | |||
| 152 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | 152 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") |
| 153 | #ifdef CONFIG_MSM_DEBUG_UART | 153 | #ifdef CONFIG_MSM_DEBUG_UART |
| 154 | #endif | 154 | #endif |
| 155 | .boot_params = PHYS_OFFSET + 0x100, | 155 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
| 156 | .map_io = msm7x2x_map_io, | 156 | .map_io = msm7x2x_map_io, |
| 157 | .init_irq = msm7x2x_init_irq, | 157 | .init_irq = msm7x2x_init_irq, |
| 158 | .init_machine = msm7x2x_init, | 158 | .init_machine = msm7x2x_init, |
| @@ -162,7 +162,7 @@ MACHINE_END | |||
| 162 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") | 162 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") |
| 163 | #ifdef CONFIG_MSM_DEBUG_UART | 163 | #ifdef CONFIG_MSM_DEBUG_UART |
| 164 | #endif | 164 | #endif |
| 165 | .boot_params = PHYS_OFFSET + 0x100, | 165 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |
| 166 | .map_io = msm7x2x_map_io, | 166 | .map_io = msm7x2x_map_io, |
| 167 | .init_irq = msm7x2x_init_irq, | 167 | .init_irq = msm7x2x_init_irq, |
| 168 | .init_machine = msm7x2x_init, | 168 | .init_machine = msm7x2x_init, |