diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2006-01-05 03:31:42 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2006-01-05 03:31:42 +0000 |
| commit | b951721f0c713f7043f0346e16c9b0d5190633f3 (patch) | |
| tree | b5f5254266a6353199d07e2eb95544d130ad6c08 /v4l | |
| parent | f7f8cd7c769882afe66875f83b23602bb23efed4 (diff) | |
| download | mediapointer-dvb-s2-b951721f0c713f7043f0346e16c9b0d5190633f3.tar.gz mediapointer-dvb-s2-b951721f0c713f7043f0346e16c9b0d5190633f3.tar.bz2 | |
Workaround to deal with the cx88 DMA code conflicts
From: Ricardo Cerqueira <v4l@cerqueira.org>
Existing audio DMA uses conflict with cx88-alsa. This workaround disables
that code if cx88-alsa is being compiled
Signed-off-by:
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 15 | ||||
| -rw-r--r-- | v4l/Makefile | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 00c27a819..cdd514ece 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2006-01-05 03:27 rmcc + + * linux/drivers/media/video/cx88/cx88-alsa.c: + (_cx88_start_audio_dma), (_cx88_stop_audio_dma): + * linux/drivers/media/video/cx88/cx88-core.c: + (cx88_start_audio_dma): + * linux/drivers/media/video/cx88/cx88-tvaudio.c: + (set_audio_finish): + * v4l/Makefile: + + - (Temporary?) workaround for the conflict with existing cx88 audio + DMA calls + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2006-01-05 02:01 rmcc * linux/drivers/media/video/cx88/cx88-alsa.c: (cx8801_aud_irq): diff --git a/v4l/Makefile b/v4l/Makefile index f96c7de85..459e5e9a3 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! ifeq ($(CONFIG_VIDEO_ALSA),m) + EXTRA_CFLAGS += -DUSING_CX88_ALSA=1 cx8801-objs := cx88-alsa.o obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o endif |