Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31636
b: refs/heads/master
c: 8c56e72
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 2, 2006
1 parent f104b39 commit f3a3f78
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1fb9df5d3069064c037c81c0ab8bf783ffa5e373
refs/heads/master: 8c56e7214effd2fa50359e58832ad9c3eb51a3de
2 changes: 1 addition & 1 deletion trunk/drivers/parisc/eisa.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)
}
pcibios_register_hba(&eisa_dev.hba);

result = request_irq(dev->irq, eisa_irq, SA_SHIRQ, "EISA", &eisa_dev);
result = request_irq(dev->irq, eisa_irq, IRQF_SHARED, "EISA", &eisa_dev);
if (result) {
printk(KERN_ERR "EISA: request_irq failed!\n");
return result;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ superio_init(struct pci_dev *pcidev)
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");
Expand Down

0 comments on commit f3a3f78

Please sign in to comment.