diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /drivers/media/video/bttv-driver.c | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/media/video/bttv-driver.c')
| -rw-r--r-- | drivers/media/video/bttv-driver.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index eee9322ce21b..087efb4dea09 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
| @@ -4047,7 +4047,6 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) | |||
| 4047 | struct bttv_buffer_set idle; | 4047 | struct bttv_buffer_set idle; |
| 4048 | unsigned long flags; | 4048 | unsigned long flags; |
| 4049 | 4049 | ||
| 4050 | dprintk("bttv%d: suspend %d\n", btv->c.nr, state); | ||
| 4051 | 4050 | ||
| 4052 | /* stop dma + irqs */ | 4051 | /* stop dma + irqs */ |
| 4053 | spin_lock_irqsave(&btv->s_lock,flags); | 4052 | spin_lock_irqsave(&btv->s_lock,flags); |