diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/media/dvb/pluto2/pluto2.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media/dvb/pluto2/pluto2.c')
| -rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 2310b2bfed4e..8e4ce101eb22 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
| @@ -306,7 +306,7 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets) | |||
| 306 | TS_DMA_BYTES, PCI_DMA_FROMDEVICE); | 306 | TS_DMA_BYTES, PCI_DMA_FROMDEVICE); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | static irqreturn_t pluto_irq(int irq, void *dev_id, struct pt_regs *regs) | 309 | static irqreturn_t pluto_irq(int irq, void *dev_id) |
| 310 | { | 310 | { |
| 311 | struct pluto *pluto = dev_id; | 311 | struct pluto *pluto = dev_id; |
| 312 | u32 tscr; | 312 | u32 tscr; |