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-omap1/board-htcherald.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-omap1/board-htcherald.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 4af7bfa40e4a..fcd1a3c31896 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c | |||
| @@ -610,7 +610,7 @@ static void __init htcherald_init_irq(void) | |||
| 610 | MACHINE_START(HERALD, "HTC Herald") | 610 | MACHINE_START(HERALD, "HTC Herald") |
| 611 | /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */ | 611 | /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */ |
| 612 | /* Maintainer: wing-linux.sourceforge.net */ | 612 | /* Maintainer: wing-linux.sourceforge.net */ |
| 613 | .boot_params = 0x10000100, | 613 | .atag_offset = 0x100, |
| 614 | .map_io = htcherald_map_io, | 614 | .map_io = htcherald_map_io, |
| 615 | .reserve = omap_reserve, | 615 | .reserve = omap_reserve, |
| 616 | .init_irq = htcherald_init_irq, | 616 | .init_irq = htcherald_init_irq, |