diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-12 21:01:27 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:32 -0400 |
commit | 17bc98a41ae0ef82bab502ec1f9224ec5fcbe764 (patch) | |
tree | 3a093d405afee0ee2ef33db097bae59459d5e05c /drivers/media/video/bt8xx | |
parent | 4d98816be7f3e2ffe90093a8e41074ea348289df (diff) |
V4L/DVB (4499): CONFIG_PM=n slim: drivers/media/video/*
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index b2a0723af657..50dde82844ec 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -4194,6 +4194,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev) | |||
4194 | return; | 4194 | return; |
4195 | } | 4195 | } |
4196 | 4196 | ||
4197 | #ifdef CONFIG_PM | ||
4197 | static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) | 4198 | static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) |
4198 | { | 4199 | { |
4199 | struct bttv *btv = pci_get_drvdata(pci_dev); | 4200 | struct bttv *btv = pci_get_drvdata(pci_dev); |
@@ -4274,6 +4275,7 @@ static int bttv_resume(struct pci_dev *pci_dev) | |||
4274 | spin_unlock_irqrestore(&btv->s_lock,flags); | 4275 | spin_unlock_irqrestore(&btv->s_lock,flags); |
4275 | return 0; | 4276 | return 0; |
4276 | } | 4277 | } |
4278 | #endif | ||
4277 | 4279 | ||
4278 | static struct pci_device_id bttv_pci_tbl[] = { | 4280 | static struct pci_device_id bttv_pci_tbl[] = { |
4279 | {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, | 4281 | {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, |
@@ -4294,8 +4296,10 @@ static struct pci_driver bttv_pci_driver = { | |||
4294 | .id_table = bttv_pci_tbl, | 4296 | .id_table = bttv_pci_tbl, |
4295 | .probe = bttv_probe, | 4297 | .probe = bttv_probe, |
4296 | .remove = __devexit_p(bttv_remove), | 4298 | .remove = __devexit_p(bttv_remove), |
4299 | #ifdef CONFIG_PM | ||
4297 | .suspend = bttv_suspend, | 4300 | .suspend = bttv_suspend, |
4298 | .resume = bttv_resume, | 4301 | .resume = bttv_resume, |
4302 | #endif | ||
4299 | }; | 4303 | }; |
4300 | 4304 | ||
4301 | static int bttv_init_module(void) | 4305 | static int bttv_init_module(void) |