diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/mach-u300/u300.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/mach-u300/u300.c')
| -rw-r--r-- | arch/arm/mach-u300/u300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c index def45bda2932..f30c69d91d99 100644 --- a/arch/arm/mach-u300/u300.c +++ b/arch/arm/mach-u300/u300.c | |||
| @@ -47,7 +47,7 @@ static void __init u300_init_machine(void) | |||
| 47 | 47 | ||
| 48 | MACHINE_START(U300, MACH_U300_STRING) | 48 | MACHINE_START(U300, MACH_U300_STRING) |
| 49 | /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ | 49 | /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ |
| 50 | .atag_offset = BOOT_PARAMS_OFFSET, | 50 | .atag_offset = 0x100, |
| 51 | .map_io = u300_map_io, | 51 | .map_io = u300_map_io, |
| 52 | .init_irq = u300_init_irq, | 52 | .init_irq = u300_init_irq, |
| 53 | .handle_irq = vic_handle_irq, | 53 | .handle_irq = vic_handle_irq, |