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/video/saa7134 | |
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/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-oss.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index d77e6a8d9432..f1fd69e7f119 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -929,7 +929,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | |||
929 | 929 | ||
930 | 930 | ||
931 | err = request_irq(dev->pci->irq, saa7134_alsa_irq, | 931 | err = request_irq(dev->pci->irq, saa7134_alsa_irq, |
932 | SA_SHIRQ | SA_INTERRUPT, dev->name, | 932 | IRQF_SHARED | IRQF_DISABLED, dev->name, |
933 | (void*) &dev->dmasound); | 933 | (void*) &dev->dmasound); |
934 | 934 | ||
935 | if (err < 0) { | 935 | if (err < 0) { |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 535172f643b9..6e97cc84ba89 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -923,7 +923,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
923 | 923 | ||
924 | /* get irq */ | 924 | /* get irq */ |
925 | err = request_irq(pci_dev->irq, saa7134_irq, | 925 | err = request_irq(pci_dev->irq, saa7134_irq, |
926 | SA_SHIRQ | SA_INTERRUPT, dev->name, dev); | 926 | IRQF_SHARED | IRQF_DISABLED, dev->name, dev); |
927 | if (err < 0) { | 927 | if (err < 0) { |
928 | printk(KERN_ERR "%s: can't get IRQ %d\n", | 928 | printk(KERN_ERR "%s: can't get IRQ %d\n", |
929 | dev->name,pci_dev->irq); | 929 | dev->name,pci_dev->irq); |
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 7aa02b34e012..3895d05804ae 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -845,7 +845,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev) | |||
845 | { | 845 | { |
846 | 846 | ||
847 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, | 847 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, |
848 | SA_SHIRQ | SA_INTERRUPT, dev->name, | 848 | IRQF_SHARED | IRQF_DISABLED, dev->name, |
849 | (void*) &dev->dmasound)) < 0) | 849 | (void*) &dev->dmasound)) < 0) |
850 | return -1; | 850 | return -1; |
851 | 851 | ||