From f3a3f78b8effeb2ae7cf88b670a2e703338eb307 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 1 Jul 2006 19:29:40 -0700 Subject: [PATCH] --- yaml --- r: 31636 b: refs/heads/master c: 8c56e7214effd2fa50359e58832ad9c3eb51a3de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/parisc/eisa.c | 2 +- trunk/drivers/parisc/superio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d5335be35f7..7dcc2b8e0cbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb9df5d3069064c037c81c0ab8bf783ffa5e373 +refs/heads/master: 8c56e7214effd2fa50359e58832ad9c3eb51a3de diff --git a/trunk/drivers/parisc/eisa.c b/trunk/drivers/parisc/eisa.c index 58f0ce8d78e0..884965cedec9 100644 --- a/trunk/drivers/parisc/eisa.c +++ b/trunk/drivers/parisc/eisa.c @@ -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; diff --git a/trunk/drivers/parisc/superio.c b/trunk/drivers/parisc/superio.c index a988dc7a9abd..4ee26a6d9e25 100644 --- a/trunk/drivers/parisc/superio.c +++ b/trunk/drivers/parisc/superio.c @@ -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");