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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
media
/
video
/
zr36120.c
diff --git
a/drivers/media/video/zr36120.c
b/drivers/media/video/zr36120.c
index
5043738
..
6ac3b67
100644
(file)
--- a/
drivers/media/video/zr36120.c
+++ b/
drivers/media/video/zr36120.c
@@
-1858,7
+1858,7
@@
int __init find_zoran(void)
DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem));
result = request_irq(dev->irq, zoran_irq,
DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem));
result = request_irq(dev->irq, zoran_irq,
-
IRQF_SHARED|IRQF_DISABLED
,"zoran", ztv);
+
SA_SHIRQ|SA_INTERRUPT
,"zoran", ztv);
if (result==-EINVAL)
{
iounmap(ztv->zoran_mem);
if (result==-EINVAL)
{
iounmap(ztv->zoran_mem);