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]
/
drivers
/
media
/
video
/
stradis.c
diff --git
a/drivers/media/video/stradis.c
b/drivers/media/video/stradis.c
index
af372dd
..
5686547
100644
(file)
--- a/
drivers/media/video/stradis.c
+++ b/
drivers/media/video/stradis.c
@@
-42,6
+42,7
@@
#include <asm/uaccess.h>
#include <linux/vmalloc.h>
#include <linux/videodev.h>
#include <asm/uaccess.h>
#include <linux/vmalloc.h>
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include "saa7146.h"
#include "saa7146reg.h"
#include "saa7146.h"
#include "saa7146reg.h"
@@
-1982,7
+1983,7
@@
static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
memcpy(&saa->video_dev, &saa_template, sizeof(saa_template));
saawrite(0, SAA7146_IER); /* turn off all interrupts */
memcpy(&saa->video_dev, &saa_template, sizeof(saa_template));
saawrite(0, SAA7146_IER); /* turn off all interrupts */
- retval = request_irq(saa->irq, saa7146_irq,
SA_SHIRQ | SA_INTERRUPT
,
+ retval = request_irq(saa->irq, saa7146_irq,
IRQF_SHARED | IRQF_DISABLED
,
"stradis", saa);
if (retval == -EINVAL)
dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
"stradis", saa);
if (retval == -EINVAL)
dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
@@
-2188,7
+2189,7
@@
static struct pci_driver stradis_driver = {
.remove = __devexit_p(stradis_remove)
};
.remove = __devexit_p(stradis_remove)
};
-int __init stradis_init(void)
+
static
int __init stradis_init(void)
{
int retval;
{
int retval;
@@
-2201,7
+2202,7
@@
int __init stradis_init(void)
return retval;
}
return retval;
}
-void __exit stradis_exit(void)
+
static
void __exit stradis_exit(void)
{
pci_unregister_driver(&stradis_driver);
printk(KERN_INFO "stradis: module cleanup complete\n");
{
pci_unregister_driver(&stradis_driver);
printk(KERN_INFO "stradis: module cleanup complete\n");