diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch) | |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-davinci/board-sffsdr.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-davinci/board-sffsdr.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-sffsdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 5f4385c0a089..5dd4da9d2308 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c | |||
| @@ -151,7 +151,7 @@ static __init void davinci_sffsdr_init(void) | |||
| 151 | 151 | ||
| 152 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") | 152 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") |
| 153 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ | 153 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ |
| 154 | .boot_params = (DAVINCI_DDR_BASE + 0x100), | 154 | .atag_offset = 0x100, |
| 155 | .map_io = davinci_sffsdr_map_io, | 155 | .map_io = davinci_sffsdr_map_io, |
| 156 | .init_irq = davinci_irq_init, | 156 | .init_irq = davinci_irq_init, |
| 157 | .timer = &davinci_timer, | 157 | .timer = &davinci_timer, |