diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-24 10:11:44 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-24 10:12:04 -0700 |
| commit | 4a0cce791ecc354abc950b530c23c0baa4d628fd (patch) | |
| tree | e3067a195b19542a3f27b107839cc6e74d54d4c4 /arch/arm/mach-at91/at91sam9n12.c | |
| parent | 580b000d7c9f77a9829fd255bb15b801bfd3119d (diff) | |
| parent | 144ea15e4fefbee14a7dcb05c7cd0822fda3ebf6 (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre:
- One definition fix that can lead to mis-clock some AT91 peripherals on SAMA5.
- Two DT related fixes.
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/sama5: fix incorrect PMC pcr div definition
ARM: at91/dt: fix macb pinctrl_macb_rmii_mii_alt definition
ARM: at91: at91sam9n12: move external irq declatation to DT
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9n12.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c index 13cdbcd48f5..c7d670d1180 100644 --- a/arch/arm/mach-at91/at91sam9n12.c +++ b/arch/arm/mach-at91/at91sam9n12.c @@ -223,13 +223,7 @@ static void __init at91sam9n12_map_io(void) at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE); } -void __init at91sam9n12_initialize(void) -{ - at91_extern_irq = (1 << AT91SAM9N12_ID_IRQ0); -} - AT91_SOC_START(at91sam9n12) .map_io = at91sam9n12_map_io, .register_clocks = at91sam9n12_register_clocks, - .init = at91sam9n12_initialize, AT91_SOC_END |