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]
/
drivers
/
parisc
/
superio.c
diff --git
a/drivers/parisc/superio.c
b/drivers/parisc/superio.c
index
828eb45
..
4ee26a6
100644
(file)
--- a/
drivers/parisc/superio.c
+++ b/
drivers/parisc/superio.c
@@
-271,7
+271,7
@@
superio_init(struct pci_dev *pcidev)
else
printk(KERN_ERR PFX "USB regulator not initialized!\n");
else
printk(KERN_ERR PFX "USB regulator not initialized!\n");
- if (request_irq(pdev->irq, superio_interrupt,
SA_INTERRUPT
,
+ if (request_irq(pdev->irq, superio_interrupt,
IRQF_DISABLED
,
SUPERIO, (void *)sio)) {
printk(KERN_ERR PFX "could not get irq\n");
SUPERIO, (void *)sio)) {
printk(KERN_ERR PFX "could not get irq\n");
@@
-360,7
+360,7
@@
int superio_fixup_irq(struct pci_dev *pcidev)
#endif
for (i = 0; i < 16; i++) {
#endif
for (i = 0; i < 16; i++) {
- irq_desc[i].
handler
= &superio_interrupt_type;
+ irq_desc[i].
chip
= &superio_interrupt_type;
}
/*
}
/*