diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-msm/board-msm7x27.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
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 c03f269e2e4..a80765533f1 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c | |||
| @@ -130,7 +130,7 @@ static void __init msm7x2x_map_io(void) | |||
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | 132 | MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") |
| 133 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 133 | .atag_offset = 0x100, |
| 134 | .map_io = msm7x2x_map_io, | 134 | .map_io = msm7x2x_map_io, |
| 135 | .init_irq = msm7x2x_init_irq, | 135 | .init_irq = msm7x2x_init_irq, |
| 136 | .init_machine = msm7x2x_init, | 136 | .init_machine = msm7x2x_init, |
| @@ -138,7 +138,7 @@ MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") | |||
| 138 | MACHINE_END | 138 | MACHINE_END |
| 139 | 139 | ||
| 140 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | 140 | MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") |
| 141 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 141 | .atag_offset = 0x100, |
| 142 | .map_io = msm7x2x_map_io, | 142 | .map_io = msm7x2x_map_io, |
| 143 | .init_irq = msm7x2x_init_irq, | 143 | .init_irq = msm7x2x_init_irq, |
| 144 | .init_machine = msm7x2x_init, | 144 | .init_machine = msm7x2x_init, |
| @@ -146,7 +146,7 @@ MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") | |||
| 146 | MACHINE_END | 146 | MACHINE_END |
| 147 | 147 | ||
| 148 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | 148 | MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") |
| 149 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 149 | .atag_offset = 0x100, |
| 150 | .map_io = msm7x2x_map_io, | 150 | .map_io = msm7x2x_map_io, |
| 151 | .init_irq = msm7x2x_init_irq, | 151 | .init_irq = msm7x2x_init_irq, |
| 152 | .init_machine = msm7x2x_init, | 152 | .init_machine = msm7x2x_init, |
| @@ -154,7 +154,7 @@ MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") | |||
| 154 | MACHINE_END | 154 | MACHINE_END |
| 155 | 155 | ||
| 156 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") | 156 | MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") |
| 157 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 157 | .atag_offset = 0x100, |
| 158 | .map_io = msm7x2x_map_io, | 158 | .map_io = msm7x2x_map_io, |
| 159 | .init_irq = msm7x2x_init_irq, | 159 | .init_irq = msm7x2x_init_irq, |
| 160 | .init_machine = msm7x2x_init, | 160 | .init_machine = msm7x2x_init, |