diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-05 16:03:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-05 16:03:18 -0400 |
| commit | 887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1 (patch) | |
| tree | 259fac45eddabae544b972c21fae7c031202b910 /include | |
| parent | e8f75588dd5885868147b329ced4a5093dc6402e (diff) | |
| parent | ba854e18413d2d827f050984edeb8286c3335895 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3711/1: AT91 timer update
[ARM] 3709/1: pnx4008: convert to generic irq subsystem
[ARM] 3710/1: AT91 Serial: Use GPIO API
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-at91rm9200/irqs.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-arm/arch-at91rm9200/irqs.h b/include/asm-arm/arch-at91rm9200/irqs.h index 2dc93b174a8f..f63842c2c093 100644 --- a/include/asm-arm/arch-at91rm9200/irqs.h +++ b/include/asm-arm/arch-at91rm9200/irqs.h | |||
| @@ -39,12 +39,4 @@ | |||
| 39 | */ | 39 | */ |
| 40 | #define NR_IRQS (NR_AIC_IRQS + (4 * 32)) | 40 | #define NR_IRQS (NR_AIC_IRQS + (4 * 32)) |
| 41 | 41 | ||
| 42 | |||
| 43 | #ifndef __ASSEMBLY__ | ||
| 44 | /* | ||
| 45 | * Initialize the IRQ controller. | ||
| 46 | */ | ||
| 47 | extern void at91rm9200_init_irq(unsigned int priority[]); | ||
| 48 | #endif | ||
| 49 | |||
| 50 | #endif | 42 | #endif |