projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
drivers
/
media
/
video
/
stradis.c
diff --git
a/drivers/media/video/stradis.c
b/drivers/media/video/stradis.c
index
5686547
..
525d812
100644
(file)
--- a/
drivers/media/video/stradis.c
+++ b/
drivers/media/video/stradis.c
@@
-406,7
+406,7
@@
static void send_osd_data(struct saa7146 *saa)
}
}
-static irqreturn_t saa7146_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t saa7146_irq(int irq, void *dev_id)
{
struct saa7146 *saa = dev_id;
u32 stat, astat;