projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual update from upstream:
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
io_apic.c
diff --git
a/arch/x86_64/kernel/io_apic.c
b/arch/x86_64/kernel/io_apic.c
index
522944a
..
c8eee20
100644
(file)
--- a/
arch/x86_64/kernel/io_apic.c
+++ b/
arch/x86_64/kernel/io_apic.c
@@
-299,15
+299,6
@@
void __init check_ioapic(void)
#endif
/* RED-PEN skip them on mptables too? */
return;
#endif
/* RED-PEN skip them on mptables too? */
return;
- case PCI_VENDOR_ID_ATI:
- /* All timer interrupts on atiixp
- are doubled. Disable one. */
- if (disable_timer_pin_1 == 0) {
- disable_timer_pin_1 = 1;
- printk(KERN_INFO
- "ATI board detected. Disabling timer pin 1.\n");
- }
- return;
}
/* No multi-function device? */
}
/* No multi-function device? */