diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-13 10:18:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-13 10:18:44 -0300 |
| commit | af1f59fa1dacf231cf12ff92ee3a50e0a43c47bf (patch) | |
| tree | 7c6bd595466fa598b5e54de6da3a3ddc29d3587f /linux/drivers/media/video/bt8xx | |
| parent | 8bec8b2fc0ebc5341133bdf0f012ecf28355f29d (diff) | |
| parent | 327b3eeac63ecf26ab99824b7a86b8881c49ffa7 (diff) | |
| download | mediapointer-dvb-s2-af1f59fa1dacf231cf12ff92ee3a50e0a43c47bf.tar.gz mediapointer-dvb-s2-af1f59fa1dacf231cf12ff92ee3a50e0a43c47bf.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index f927e5658..f2924c532 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -4235,6 +4235,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev) return; } +#ifdef CONFIG_PM static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct bttv *btv = pci_get_drvdata(pci_dev); @@ -4327,6 +4328,7 @@ static int bttv_resume(struct pci_dev *pci_dev) spin_unlock_irqrestore(&btv->s_lock,flags); return 0; } +#endif static struct pci_device_id bttv_pci_tbl[] = { {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, @@ -4347,8 +4349,10 @@ static struct pci_driver bttv_pci_driver = { .id_table = bttv_pci_tbl, .probe = bttv_probe, .remove = __devexit_p(bttv_remove), +#ifdef CONFIG_PM .suspend = bttv_suspend, .resume = bttv_resume, +#endif }; static int bttv_init_module(void) |