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-realview/realview_pb1176.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-realview/realview_pb1176.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index cbdc97a5685f..9f26369555c7 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
| @@ -379,7 +379,7 @@ static void __init realview_pb1176_init(void) | |||
| 379 | 379 | ||
| 380 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") | 380 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") |
| 381 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 381 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 382 | .boot_params = PHYS_OFFSET + 0x00000100, | 382 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, |
| 383 | .fixup = realview_pb1176_fixup, | 383 | .fixup = realview_pb1176_fixup, |
| 384 | .map_io = realview_pb1176_map_io, | 384 | .map_io = realview_pb1176_map_io, |
| 385 | .init_irq = gic_init_irq, | 385 | .init_irq = gic_init_irq, |