diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l/Make.config | 3 | ||||
| -rw-r--r-- | v4l/Makefile | 11 |
3 files changed, 21 insertions, 5 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index cdd514ece..563fbd022 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2006-01-05 04:13 rmcc + + * linux/drivers/media/video/cx88/cx88-alsa.c: + (_cx88_stop_audio_dma): + * v4l/Make.config: + * v4l/Makefile: + + - CONFIG_VIDEO_ALSA now encompasses both the SAA713x and CX88x modules, + and is enabled by default + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2006-01-05 03:27 rmcc * linux/drivers/media/video/cx88/cx88-alsa.c: diff --git a/v4l/Make.config b/v4l/Make.config index 1aaea7e4f..b80a5b25f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -13,7 +13,8 @@ CONFIG_SAA711X := m CONFIG_VIDEO_DECODER := m -CONFIG_VIDEO_ALSA := n +CONFIG_VIDEO_ALSA := y + CONFIG_VIDEO_ADV_DEBUG := y # doesn't build on older kernels diff --git a/v4l/Makefile b/v4l/Makefile index 459e5e9a3..dbbe72656 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -77,15 +77,16 @@ obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o 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) +ifeq ($(CONFIG_VIDEO_ALSA),y) EXTRA_CFLAGS += -DUSING_CX88_ALSA=1 - cx8801-objs := cx88-alsa.o obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o + obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o +## This one is installed by ALSA as snd_bt87x +# obj-$(CONFIG_VIDEO_BTTV) += bt87x.o endif obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o saa7134-oss.o +obj-$(CONFIG_VIDEO_SAA7134) += saa7134-oss.o obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ @@ -263,6 +264,7 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko +inst_video := bt87x.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko ifeq ($(CONFIG_VIDEO_DEV),m) @@ -310,6 +312,7 @@ default:: links .version links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ../linux/sound -name '*.[c,h]' -type f -exec ln -sf '{}' . \; # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; |