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/cx88/cx88-dvb.c | |
| 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/cx88/cx88-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 07914f558..b2376b20f 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -871,8 +871,10 @@ static struct pci_driver dvb_pci_driver = { .id_table = cx8802_pci_tbl, .probe = dvb_probe, .remove = __devexit_p(dvb_remove), +#ifdef CONFIG_PM .suspend = cx8802_suspend_common, .resume = cx8802_resume_common, +#endif }; static int dvb_init(void) |