diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /arch/ia64/sn/kernel/irq.c | |
| parent | [IA64] Increase max physical address for SN platforms (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-344a076110f4ecb16ea6d286b63be696604982ed.tar.xz linux-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 'arch/ia64/sn/kernel/irq.c')
| -rw-r--r-- | arch/ia64/sn/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 9fc74631ba8a..01d18b7b5bb3 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c @@ -23,7 +23,7 @@ static void force_interrupt(int irq); static void register_intr_pda(struct sn_irq_info *sn_irq_info); static void unregister_intr_pda(struct sn_irq_info *sn_irq_info); -extern int sn_force_interrupt_flag; +int sn_force_interrupt_flag = 1; extern int sn_ioif_inited; static struct list_head **sn_irq_lh; static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */ |