diff options
| author | Andrey Panin <pazke@donpac.ru> | 2006-10-28 10:38:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-28 11:30:52 -0700 |
| commit | 08d892f11aae7125fe078cf93ec5cf6af288c5e7 (patch) | |
| tree | 133af5351cb36c7415235accc71544006be60561 /arch/i386 | |
| parent | 52fd24ca1db3a741f144bbc229beefe044202cac (diff) | |
| download | op-kernel-dev-08d892f11aae7125fe078cf93ec5cf6af288c5e7.zip op-kernel-dev-08d892f11aae7125fe078cf93ec5cf6af288c5e7.tar.gz | |
[PATCH] visws build fix
Fix this:
> Subject : CONFIG_X86_VISWS=3Dy, CONFIG_SMP=3Dn compile error
> References : http://lkml.org/lkml/2006/10/7/51
> Submitter : Jesper Juhl <jesper.juhl@gmail.com>
> Caused-By : David Howells <dhowells@redhat.com>
> commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5
> Status : unknown
Via undescribed means.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/mach-visws/visws_apic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c index 07097ed..38c2b13 100644 --- a/arch/i386/mach-visws/visws_apic.c +++ b/arch/i386/mach-visws/visws_apic.c @@ -122,7 +122,7 @@ static void end_cobalt_irq(unsigned int irq) spin_unlock_irqrestore(&cobalt_lock, flags); } -static struct hw_interrupt_type cobalt_irq_type = { +static struct irq_chip cobalt_irq_type = { .typename = "Cobalt-APIC", .startup = startup_cobalt_irq, .shutdown = disable_cobalt_irq, @@ -159,7 +159,7 @@ static void end_piix4_master_irq(unsigned int irq) spin_unlock_irqrestore(&cobalt_lock, flags); } -static struct hw_interrupt_type piix4_master_irq_type = { +static struct irq_chip piix4_master_irq_type = { .typename = "PIIX4-master", .startup = startup_piix4_master_irq, .ack = ack_cobalt_irq, @@ -167,9 +167,8 @@ static struct hw_interrupt_type piix4_master_irq_type = { }; -static struct hw_interrupt_type piix4_virtual_irq_type = { +static struct irq_chip piix4_virtual_irq_type = { .typename = "PIIX4-virtual", - .startup = startup_8259A_irq, .shutdown = disable_8259A_irq, .enable = enable_8259A_irq, .disable = disable_8259A_irq, |
