diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-prima2 | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-prima2')
| -rw-r--r-- | arch/arm/mach-prima2/prima2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c index 0ddf44698ec5..a3918d9994af 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/prima2.c | |||
| @@ -31,7 +31,7 @@ static const char *prima2cb_dt_match[] __initdata = { | |||
| 31 | 31 | ||
| 32 | MACHINE_START(PRIMA2_EVB, "prima2cb") | 32 | MACHINE_START(PRIMA2_EVB, "prima2cb") |
| 33 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 33 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
| 34 | .boot_params = 0x00000100, | 34 | .atag_offset = 0x100, |
| 35 | .init_early = sirfsoc_of_clk_init, | 35 | .init_early = sirfsoc_of_clk_init, |
| 36 | .map_io = sirfsoc_map_lluart, | 36 | .map_io = sirfsoc_map_lluart, |
| 37 | .init_irq = sirfsoc_of_irq_init, | 37 | .init_irq = sirfsoc_of_irq_init, |