diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /include/asm-ia64/irq.h | |
| parent | [IA64] Increase max physical address for SN platforms (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-344a076110f4ecb16ea6d286b63be696604982ed.tar.xz linux-dev-344a076110f4ecb16ea6d286b63be696604982ed.zip | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/irq.h')
| -rw-r--r-- | include/asm-ia64/irq.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/asm-ia64/irq.h b/include/asm-ia64/irq.h index 585644c6b21c..dbe86c0bbce5 100644 --- a/include/asm-ia64/irq.h +++ b/include/asm-ia64/irq.h @@ -14,6 +14,11 @@ #define NR_IRQS 256 #define NR_IRQ_VECTORS NR_IRQS +/* + * IRQ line status macro IRQ_PER_CPU is used + */ +#define ARCH_HAS_IRQ_PER_CPU + static __inline__ int irq_canonicalize (int irq) { @@ -30,10 +35,4 @@ extern void disable_irq_nosync (unsigned int); extern void enable_irq (unsigned int); extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); -#ifdef CONFIG_SMP -extern void move_irq(int irq); -#else -#define move_irq(irq) -#endif - #endif /* _ASM_IA64_IRQ_H */ |