diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 17:08:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 17:08:08 -0400 |
| commit | 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 (patch) | |
| tree | 176e2dd02e60942bd1afc7ec45bbb18939461424 /include | |
| parent | a8400986fb0bff251ac4dd9e2188cf0b59443d3f (diff) | |
| parent | 3b5cc09033f49d004006acf44e5b05036bd46a85 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/hw_irq.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/sn/xp.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ia64/hw_irq.h b/include/asm-ia64/hw_irq.h index cd4e06b74ab6..041ab8c51a64 100644 --- a/include/asm-ia64/hw_irq.h +++ b/include/asm-ia64/hw_irq.h | |||
| @@ -81,7 +81,6 @@ extern __u8 isa_irq_to_vector_map[16]; | |||
| 81 | 81 | ||
| 82 | extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */ | 82 | extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */ |
| 83 | 83 | ||
| 84 | extern int assign_irq_vector_nopanic (int irq); /* allocate a free vector without panic */ | ||
| 85 | extern int assign_irq_vector (int irq); /* allocate a free vector */ | 84 | extern int assign_irq_vector (int irq); /* allocate a free vector */ |
| 86 | extern void free_irq_vector (int vector); | 85 | extern void free_irq_vector (int vector); |
| 87 | extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect); | 86 | extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect); |
diff --git a/include/asm-ia64/sn/xp.h b/include/asm-ia64/sn/xp.h index 9902185c0288..1df1c9f61a65 100644 --- a/include/asm-ia64/sn/xp.h +++ b/include/asm-ia64/sn/xp.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define _ASM_IA64_SN_XP_H | 16 | #define _ASM_IA64_SN_XP_H |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #include <linux/version.h> | ||
| 20 | #include <linux/cache.h> | 19 | #include <linux/cache.h> |
| 21 | #include <linux/hardirq.h> | 20 | #include <linux/hardirq.h> |
| 22 | #include <asm/sn/types.h> | 21 | #include <asm/sn/types.h> |