diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index aac5d7b2f..891266e93 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-alsa.c,v 1.29 2006/01/12 13:09:55 mchehab Exp $ + * $Id: cx88-alsa.c,v 1.30 2006/01/15 08:45:20 mchehab Exp $ * * Support for audio capture * PCI function #1 of the cx2388x. @@ -823,7 +823,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 }; /**************************************************************************** diff --git a/v4l/ChangeLog b/v4l/ChangeLog index a92f638da..42e1efbda 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-01-15 08:43 mchehab + + * linux/drivers/media/video/cx88/cx88-alsa.c: + + - Not sure what went wrong here, but SND_PCI_PM_CALLBACKS got deleted. + + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> + 2006-01-15 02:26 mcisely * v4l_experimental/pvrusb2/Kbuild: |