diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 14:08:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 14:08:08 -0700 |
| commit | 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 (patch) | |
| tree | 176e2dd02e60942bd1afc7ec45bbb18939461424 /include | |
| parent | [PATCH] v850: Update mmu.h header to match implementation changes (diff) | |
| parent | [IA64] assign_irq_vector() should not panic (diff) | |
| download | linux-dev-1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6.tar.xz linux-dev-1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6.zip | |
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]; extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */ -extern int assign_irq_vector_nopanic (int irq); /* allocate a free vector without panic */ extern int assign_irq_vector (int irq); /* allocate a free vector */ extern void free_irq_vector (int vector); 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 @@ #define _ASM_IA64_SN_XP_H -#include <linux/version.h> #include <linux/cache.h> #include <linux/hardirq.h> #include <asm/sn/types.h> |