summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-25 18:48:44 +0000
committerMichael Krufky <devnull@localhost>2005-10-25 18:48:44 +0000
commitdade121b62461fc01d9fe24ceb1c30afef7c4be8 (patch)
tree589740d50369187f189ec3b0e31b4f45a5bcdd8b
parent4b05d47d452e4251b6e1b0bbd4393f113b9f6131 (diff)
downloadmediapointer-dvb-s2-dade121b62461fc01d9fe24ceb1c30afef7c4be8.tar.gz
mediapointer-dvb-s2-dade121b62461fc01d9fe24ceb1c30afef7c4be8.tar.bz2
- obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o
+ saa7134-objs += saa7134-alsa.o Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--v4l/ChangeLog8
-rw-r--r--v4l/Makefile2
2 files changed, 9 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 6dfafc139..bcd3e16cc 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-25 18:48 mkrufky
+
+ * ../v4l/Makefile:
+ - obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o
+ + saa7134-objs += saa7134-alsa.o
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-25 17:24 nshmyrev
* ../linux/drivers/media/video/saa7134/saa7134-alsa.c:
diff --git a/v4l/Makefile b/v4l/Makefile
index 76cc337d7..37cfed5cc 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -43,7 +43,7 @@ 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
+ saa7134-objs += saa7134-alsa.o
endif
obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o