diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-spear3xx | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-spear3xx')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300_evb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear310_evb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear320_evb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c index 69006f694220..a5ff98eed1db 100644 --- a/arch/arm/mach-spear3xx/spear300_evb.c +++ b/arch/arm/mach-spear3xx/spear300_evb.c | |||
| @@ -64,7 +64,7 @@ static void __init spear300_evb_init(void) | |||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") | 66 | MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") |
| 67 | .boot_params = 0x00000100, | 67 | .atag_offset = 0x100, |
| 68 | .map_io = spear3xx_map_io, | 68 | .map_io = spear3xx_map_io, |
| 69 | .init_irq = spear3xx_init_irq, | 69 | .init_irq = spear3xx_init_irq, |
| 70 | .timer = &spear3xx_timer, | 70 | .timer = &spear3xx_timer, |
diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c index c8684ce1f9b3..45d180d59362 100644 --- a/arch/arm/mach-spear3xx/spear310_evb.c +++ b/arch/arm/mach-spear3xx/spear310_evb.c | |||
| @@ -70,7 +70,7 @@ static void __init spear310_evb_init(void) | |||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | MACHINE_START(SPEAR310, "ST-SPEAR310-EVB") | 72 | MACHINE_START(SPEAR310, "ST-SPEAR310-EVB") |
| 73 | .boot_params = 0x00000100, | 73 | .atag_offset = 0x100, |
| 74 | .map_io = spear3xx_map_io, | 74 | .map_io = spear3xx_map_io, |
| 75 | .init_irq = spear3xx_init_irq, | 75 | .init_irq = spear3xx_init_irq, |
| 76 | .timer = &spear3xx_timer, | 76 | .timer = &spear3xx_timer, |
diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c index a12b353940d6..22879848d73a 100644 --- a/arch/arm/mach-spear3xx/spear320_evb.c +++ b/arch/arm/mach-spear3xx/spear320_evb.c | |||
| @@ -68,7 +68,7 @@ static void __init spear320_evb_init(void) | |||
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | MACHINE_START(SPEAR320, "ST-SPEAR320-EVB") | 70 | MACHINE_START(SPEAR320, "ST-SPEAR320-EVB") |
| 71 | .boot_params = 0x00000100, | 71 | .atag_offset = 0x100, |
| 72 | .map_io = spear3xx_map_io, | 72 | .map_io = spear3xx_map_io, |
| 73 | .init_irq = spear3xx_init_irq, | 73 | .init_irq = spear3xx_init_irq, |
| 74 | .timer = &spear3xx_timer, | 74 | .timer = &spear3xx_timer, |