diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
| commit | f53f292eeaa234615c31a1306babe703fc4263f2 (patch) | |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 /arch/arm/mach-at91/board-rm9200dk.c | |
| parent | 15b9c359f288b09003cb70f7ed204affc0c6614d (diff) | |
| parent | a9499fa7cd3fd4824a7202d00c766b269fa3bda6 (diff) | |
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-rm9200dk.c')
| -rw-r--r-- | arch/arm/mach-at91/board-rm9200dk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 9e5061bef0d0..690541b18cbc 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c | |||
| @@ -219,7 +219,7 @@ static void __init dk_board_init(void) | |||
| 219 | 219 | ||
| 220 | MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK") | 220 | MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK") |
| 221 | /* Maintainer: SAN People/Atmel */ | 221 | /* Maintainer: SAN People/Atmel */ |
| 222 | .timer = &at91rm9200_timer, | 222 | .init_time = at91rm9200_timer_init, |
| 223 | .map_io = at91_map_io, | 223 | .map_io = at91_map_io, |
| 224 | .handle_irq = at91_aic_handle_irq, | 224 | .handle_irq = at91_aic_handle_irq, |
| 225 | .init_early = dk_init_early, | 225 | .init_early = dk_init_early, |