diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 7897769e8..2344e1cbd 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.42 2005/07/05 17:37:35 nsh Exp $ + $Id: bttv-driver.c,v 1.43 2005/07/15 20:09:38 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -35,6 +35,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> +#include <linux/pci.h> #include <linux/dma-mapping.h> #include <asm/io.h> @@ -4065,7 +4066,11 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) struct bttv_buffer_set idle; unsigned long flags; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) dprintk("bttv%d: suspend %d\n", btv->c.nr, state); +#else + dprintk("bttv%d: suspend %d\n", btv->c.nr, state.event); +#endif /* stop dma + irqs */ spin_lock_irqsave(&btv->s_lock,flags); |