diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:50 -0400 |
commit | 8076fe32a7db9a6628589ffa372808e4ba25d222 (patch) | |
tree | ab9a9bfef377d0fbb2ad49748488e9f7d6d9d098 /drivers/media/dvb | |
parent | 9ba02bec3888d391bad0fb0a8dd584f88eed6c8d (diff) |
[PATCH] irq-flags: media: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-pci.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/bt878.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c index f04041702191..eb2e6432c8c2 100644 --- a/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/drivers/media/dvb/b2c2/flexcop-pci.c | |||
@@ -294,7 +294,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) | |||
294 | pci_set_drvdata(fc_pci->pdev, fc_pci); | 294 | pci_set_drvdata(fc_pci->pdev, fc_pci); |
295 | 295 | ||
296 | if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr, | 296 | if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr, |
297 | SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0) | 297 | IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0) |
298 | goto err_pci_iounmap; | 298 | goto err_pci_iounmap; |
299 | 299 | ||
300 | spin_lock_init(&fc_pci->irq_lock); | 300 | spin_lock_init(&fc_pci->irq_lock); |
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index 761fa6e7d762..755822ee6e9b 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
@@ -488,7 +488,7 @@ static int __devinit bt878_probe(struct pci_dev *dev, | |||
488 | btwrite(0, BT848_INT_MASK); | 488 | btwrite(0, BT848_INT_MASK); |
489 | 489 | ||
490 | result = request_irq(bt->irq, bt878_irq, | 490 | result = request_irq(bt->irq, bt878_irq, |
491 | SA_SHIRQ | SA_INTERRUPT, "bt878", | 491 | IRQF_SHARED | IRQF_DISABLED, "bt878", |
492 | (void *) bt); | 492 | (void *) bt); |
493 | if (result == -EINVAL) { | 493 | if (result == -EINVAL) { |
494 | printk(KERN_ERR "bt878(%d): Bad irq number or handler\n", | 494 | printk(KERN_ERR "bt878(%d): Bad irq number or handler\n", |
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index acabea0793b6..2310b2bfed4e 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
@@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, | |||
616 | 616 | ||
617 | pci_set_drvdata(pdev, pluto); | 617 | pci_set_drvdata(pdev, pluto); |
618 | 618 | ||
619 | ret = request_irq(pdev->irq, pluto_irq, SA_SHIRQ, DRIVER_NAME, pluto); | 619 | ret = request_irq(pdev->irq, pluto_irq, IRQF_SHARED, DRIVER_NAME, pluto); |
620 | if (ret < 0) | 620 | if (ret < 0) |
621 | goto err_pci_iounmap; | 621 | goto err_pci_iounmap; |
622 | 622 | ||