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]
/
sound
/
oss
/
ad1889.c
diff --git
a/sound/oss/ad1889.c
b/sound/oss/ad1889.c
index
a4ca756
..
f56f870
100644
(file)
--- a/
sound/oss/ad1889.c
+++ b/
sound/oss/ad1889.c
@@
-26,7
+26,6
@@
*
* $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $
*/
*
* $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
@@
-1011,7
+1010,7
@@
static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_devic
goto out2;
}
goto out2;
}
- if (request_irq(pcidev->irq, ad1889_interrupt,
SA_SHIRQ
, DEVNAME, dev) != 0) {
+ if (request_irq(pcidev->irq, ad1889_interrupt,
IRQF_SHARED
, DEVNAME, dev) != 0) {
printk(KERN_ERR DEVNAME ": unable to request interrupt\n");
goto out3;
}
printk(KERN_ERR DEVNAME ": unable to request interrupt\n");
goto out3;
}