diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/ia64/include/asm/hw_irq.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/ia64/include/asm/hw_irq.h')
| -rw-r--r-- | arch/ia64/include/asm/hw_irq.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h index bf2e37493e04..a681d02cb324 100644 --- a/arch/ia64/include/asm/hw_irq.h +++ b/arch/ia64/include/asm/hw_irq.h | |||
| @@ -151,9 +151,6 @@ static inline void ia64_native_resend_irq(unsigned int vector) | |||
| 151 | /* | 151 | /* |
| 152 | * Default implementations for the irq-descriptor API: | 152 | * Default implementations for the irq-descriptor API: |
| 153 | */ | 153 | */ |
| 154 | |||
| 155 | extern struct irq_desc irq_desc[NR_IRQS]; | ||
| 156 | |||
| 157 | #ifndef CONFIG_IA64_GENERIC | 154 | #ifndef CONFIG_IA64_GENERIC |
| 158 | static inline ia64_vector __ia64_irq_to_vector(int irq) | 155 | static inline ia64_vector __ia64_irq_to_vector(int irq) |
| 159 | { | 156 | { |