summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-blackbird.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-08-13 03:01:27 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 17:30:32 +0200
commit17bc98a41ae0ef82bab502ec1f9224ec5fcbe764 (patch)
tree3a093d405afee0ee2ef33db097bae59459d5e05c /drivers/media/video/cx88/cx88-blackbird.c
parentV4L/DVB (4498): Offset parameter permission were 0x666, instead of 0x664 (diff)
downloadlinux-17bc98a41ae0ef82bab502ec1f9224ec5fcbe764.tar.xz
linux-17bc98a41ae0ef82bab502ec1f9224ec5fcbe764.zip
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/cx88/cx88-blackbird.c')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index b60177f173c3..a7921f9d45d8 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1160,8 +1160,10 @@ static struct pci_driver blackbird_pci_driver = {
.id_table = cx8802_pci_tbl,
.probe = blackbird_probe,
.remove = __devexit_p(blackbird_remove),
+#ifdef CONFIG_PM
.suspend = cx8802_suspend_common,
.resume = cx8802_resume_common,
+#endif
};
static int blackbird_init(void)