summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-alsa.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-01-15 21:01:27 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-15 21:01:27 -0200
commitd04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (patch)
tree1bf8070b7cff7a5f1375a141c51edcd92e3e3c6a /drivers/media/video/cx88/cx88-alsa.c
parentf1dccedc8148026d9071c6805f7cb77374a9e56f (diff)
parente0ad8486266c3415ab9c17f5c03c47edc7b93d7b (diff)
Merge branch 'work'
Diffstat (limited to 'drivers/media/video/cx88/cx88-alsa.c')
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index fd8bc718f0e..e649f678d47 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -805,7 +805,6 @@ static struct pci_driver cx88_audio_pci_driver = {
.id_table = cx88_audio_pci_tbl,
.probe = cx88_audio_initdev,
.remove = cx88_audio_finidev,
- SND_PCI_PM_CALLBACKS
};
/****************************************************************************