git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
mach-visws
/
visws_apic.c
diff --git
a/arch/i386/mach-visws/visws_apic.c
b/arch/i386/mach-visws/visws_apic.c
index
3e64fb7
..
8285225
100644
(file)
--- a/
arch/i386/mach-visws/visws_apic.c
+++ b/
arch/i386/mach-visws/visws_apic.c
@@
-16,7
+16,6
@@
* 25/11/2002 - Updated for 2.5 by Andrey Panin <pazke@orbita1.ru>
*/
* 25/11/2002 - Updated for 2.5 by Andrey Panin <pazke@orbita1.ru>
*/
-#include <linux/config.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
@@
-278,22
+277,22
@@
void init_VISWS_APIC_irqs(void)
irq_desc[i].depth = 1;
if (i == 0) {
irq_desc[i].depth = 1;
if (i == 0) {
- irq_desc[i].
handler
= &cobalt_irq_type;
+ irq_desc[i].
chip
= &cobalt_irq_type;
}
else if (i == CO_IRQ_IDE0) {
}
else if (i == CO_IRQ_IDE0) {
- irq_desc[i].
handler
= &cobalt_irq_type;
+ irq_desc[i].
chip
= &cobalt_irq_type;
}
else if (i == CO_IRQ_IDE1) {
}
else if (i == CO_IRQ_IDE1) {
- irq_desc[i].
handler
= &cobalt_irq_type;
+ irq_desc[i].
chip
= &cobalt_irq_type;
}
else if (i == CO_IRQ_8259) {
}
else if (i == CO_IRQ_8259) {
- irq_desc[i].
handler
= &piix4_master_irq_type;
+ irq_desc[i].
chip
= &piix4_master_irq_type;
}
else if (i < CO_IRQ_APIC0) {
}
else if (i < CO_IRQ_APIC0) {
- irq_desc[i].
handler
= &piix4_virtual_irq_type;
+ irq_desc[i].
chip
= &piix4_virtual_irq_type;
}
else if (IS_CO_APIC(i)) {
}
else if (IS_CO_APIC(i)) {
- irq_desc[i].
handler
= &cobalt_irq_type;
+ irq_desc[i].
chip
= &cobalt_irq_type;
}
}
}
}