diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
| commit | 9c3f9e281697d02889c3b08922f3b30be75f56c2 (patch) | |
| tree | e9f3d68e0019a47b982e2b8644f70eb66a3eff3c /arch/arm/mach-at91/generic.h | |
| parent | b8f61116c1ce342804a0897b0a80eb4df5f19453 (diff) | |
| parent | d6ad418763888f617ac5b4849823e4cd670df1dd (diff) | |
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Fix trivial conflicts in: kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index f49650677653..b62f560e6c75 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
| @@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(void); | |||
| 26 | extern void __init at91_init_irq_default(void); | 26 | extern void __init at91_init_irq_default(void); |
| 27 | extern void __init at91_init_interrupts(unsigned int priority[]); | 27 | extern void __init at91_init_interrupts(unsigned int priority[]); |
| 28 | extern void __init at91x40_init_interrupts(unsigned int priority[]); | 28 | extern void __init at91x40_init_interrupts(unsigned int priority[]); |
| 29 | extern void __init at91_aic_init(unsigned int priority[]); | 29 | extern void __init at91_aic_init(unsigned int priority[], |
| 30 | unsigned int ext_irq_mask); | ||
| 30 | extern int __init at91_aic_of_init(struct device_node *node, | 31 | extern int __init at91_aic_of_init(struct device_node *node, |
| 31 | struct device_node *parent); | 32 | struct device_node *parent); |
| 32 | extern int __init at91_aic5_of_init(struct device_node *node, | 33 | extern int __init at91_aic5_of_init(struct device_node *node, |