diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-06 06:27:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-06 06:27:57 +0200 |
| commit | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (patch) | |
| tree | 3eacbc74953999bc57137f04333bf94e7a052823 /arch/arm/mach-at91/board-eb01.c | |
| parent | VM: skip the stack guard page lookup in get_user_pages only for mlock (diff) | |
| parent | at91: Add ARCH_ID and basic cpu macros definition for 5series chips family. (diff) | |
| download | linux-bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0.tar.xz linux-bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0.zip | |
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
* 'for-linus' of git://github.com/at91linux/linux-2.6-at91:
at91: Add ARCH_ID and basic cpu macros definition for 5series chips family.
arm: at91: fix compiler warning for eb01 board build
arm: at91: minimal defconfig for at91x40 SoC
ARM: at91: AT91CAP9 has a macb device
Diffstat (limited to 'arch/arm/mach-at91/board-eb01.c')
| -rw-r--r-- | arch/arm/mach-at91/board-eb01.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c index 1f9d3cb64c50..d8df59a3426d 100644 --- a/arch/arm/mach-at91/board-eb01.c +++ b/arch/arm/mach-at91/board-eb01.c @@ -30,6 +30,11 @@ #include <mach/board.h> #include "generic.h" +static void __init at91eb01_init_irq(void) +{ + at91x40_init_interrupts(NULL); +} + static void __init at91eb01_map_io(void) { at91x40_initialize(40000000); @@ -38,7 +43,7 @@ static void __init at91eb01_map_io(void) MACHINE_START(AT91EB01, "Atmel AT91 EB01") /* Maintainer: Greg Ungerer <gerg@snapgear.com> */ .timer = &at91x40_timer, - .init_irq = at91x40_init_interrupts, + .init_irq = at91eb01_init_irq, .map_io = at91eb01_map_io, MACHINE_END |