diff options
author | Michael Krufky <devnull@localhost> | 2005-10-25 16:41:24 +0000 |
---|---|---|
committer | Michael Krufky <devnull@localhost> | 2005-10-25 16:41:24 +0000 |
commit | 2e5a3c7866ff2ad05605403a2830aa1bd9e8ede6 (patch) | |
tree | 74fa970593ba62a9eb206e7e85b5c585bc60e897 /v4l | |
parent | f7e48751fe28d3bdd184f3b3d29c17d8a12bcd56 (diff) | |
download | mediapointer-dvb-s2-2e5a3c7866ff2ad05605403a2830aa1bd9e8ede6.tar.gz mediapointer-dvb-s2-2e5a3c7866ff2ad05605403a2830aa1bd9e8ede6.tar.bz2 |
- don't build saa7134-alsa if CONFIG_VIDEO_ALSA is disabled.
- enable CONFIG_VIDEO_ALSA by default
- don't build cx88-alsa if CONFIG_VIDEO_ALSA_TESTING is disabled.
Thanks to pentium451 (irc nick), for pointing out this bug.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
-rw-r--r-- | v4l/ChangeLog | 12 | ||||
-rw-r--r-- | v4l/Make.config | 3 | ||||
-rw-r--r-- | v4l/Makefile | 8 |
3 files changed, 19 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index eca1a7848..3af49c170 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-10-25 16:33 mkrufky + + * ../v4l/Make.config: + * ../v4l/Makefile: + - don't build saa7134-alsa if CONFIG_VIDEO_ALSA is disabled. + - enable CONFIG_VIDEO_ALSA by default + - don't build cx88-alsa if CONFIG_VIDEO_ALSA_TESTING is disabled. + + Thanks to pentium451 (irc nick), for pointing out this bug. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-25 12:16 mchehab * ../linux/drivers/media/video/cs53132a.c: diff --git a/v4l/Make.config b/v4l/Make.config index 2b75f1f13..db208dc4c 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -12,7 +12,8 @@ CONFIG_TVP5150 := m CONFIG_SAA711X := m CONFIG_EM2820 := m -CONFIG_VIDEO_ALSA := n +CONFIG_VIDEO_ALSA := m +CONFIG_VIDEO_ALSA_TESTING := n # doesn't build on kernels older than 2.6.12 diff --git a/v4l/Makefile b/v4l/Makefile index 73944eed5..76cc337d7 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -18,8 +18,7 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ bttv-vbi.o bttv-i2c.o saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \ - saa7134-cards.o saa7134-ts.o saa7134-input.o \ - saa7134-alsa.o + saa7134-cards.o saa7134-ts.o saa7134-input.o cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ cx88-input.o cx8800-objs := cx88-video.o cx88-vbi.o @@ -38,11 +37,14 @@ obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM2820) += em2820.o -# THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! ifeq ($(CONFIG_VIDEO_ALSA),m) +# THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! +ifeq ($(CONFIG_VIDEO_ALSA_TESTING),m) cx8801-objs := cx88-alsa.o obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o endif + obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o +endif obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o obj-$(CONFIG_VIDEO_IR) += ir-common.o |