diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 08:16:21 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:44:08 +0100 |
commit | 62395efdb0ef42e664ca81677901268c403a6286 (patch) | |
tree | 7ce9e6ba8b3fa0c004f852b56966e96ad948d2f8 /arch/x86/kernel/visws_quirks.c | |
parent | ccd50dfd92ea2c4ba9e39531ac55db53393e783e (diff) | |
parent | 88200bc28da38bcda1cb1bd218216e83b426d8a8 (diff) |
Merge branch 'x86/asm' into tracing/syscalls
We need the wider TIF work-mask checks in entry_32.S.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/visws_quirks.c')
-rw-r--r-- | arch/x86/kernel/visws_quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c index 191a876e9e8..31ffc24eec4 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/kernel/visws_quirks.c @@ -578,7 +578,7 @@ static struct irq_chip piix4_virtual_irq_type = { static irqreturn_t piix4_master_intr(int irq, void *dev_id) { int realirq; - irq_desc_t *desc; + struct irq_desc *desc; unsigned long flags; spin_lock_irqsave(&i8259A_lock, flags); |