summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-08-10 17:01:28 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-08-10 17:01:28 +0000
commitabd770a29b452f46cbb39ecab21eaf344c396886 (patch)
treea67edb7bf40a9eeffae9f6cdce245bee018f4246 /v4l
parent13b0451e74c15685fd30e0f8efdb86604986aa66 (diff)
downloadmediapointer-dvb-s2-abd770a29b452f46cbb39ecab21eaf344c396886.tar.gz
mediapointer-dvb-s2-abd770a29b452f46cbb39ecab21eaf344c396886.tar.bz2
* Make.config, Make
- Added support for future alsa support, yet to be finished. * bt87x-alsa.c: - bt87x.c that is inside ALSA tree. Yet to make it compile from here. * cx88-alsa.c,cx88.h: - cx88 ALSA skeleton. It is not yet working. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog23
-rw-r--r--v4l/Make.config2
-rw-r--r--v4l/Makefile10
3 files changed, 33 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 8e83a6af8..d365b0ee3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,26 @@
+2005-08-10 16:52 mchehab
+
+ * Make.config, Makefile:
+ - Added support for future alsa support, yet to be finished.
+
+ * bt87x-alsa.c:
+ - bt87x.c that is inside ALSA tree. Yet to make it compile from here.
+
+ * cx88-alsa.c,cx88.h:
+ - cx88 ALSA skeleton. It is not yet working.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-08-10 16:52 mchehab
+ * cx88-video.c:
+ - Added some comments about DMA stuff.
+ - Removed obsolete code.
+
+ * tea5761.c:
+ - Removed an incorrect comment that cames from tea5767.c file.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-08-10 03:50 mchehab
* bttv-cards.c:
- It removes occurence of pci_find_device (depreciated) in the
diff --git a/v4l/Make.config b/v4l/Make.config
index 22f0dfece..e915fdacf 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -8,6 +8,8 @@ CONFIG_VIDEO_TUNER := m
CONFIG_VIDEO_TVAUDIO := m
CONFIG_VIDEO_CX88 := m
+CONFIG_VIDEO_ALSA := m
+
# doesn't build on kernels older than 2.6.12
CONFIG_VIDEO_CX88_DVB := n
diff --git a/v4l/Makefile b/v4l/Makefile
index 06d390e6c..6d68c37c9 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -24,7 +24,6 @@ saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.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
-cx8801-objs := cx88-alsa.o
cx8802-objs := cx88-mpeg.o
tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
list-multi := bttv.o saa7134.o cx88xx.o cx8800.o cx8801.o cx8802.o
@@ -32,8 +31,15 @@ list-multi := bttv.o saa7134.o cx88xx.o cx8800.o cx8801.o cx8802.o
# what to build
obj-m := video-buf.o v4l1-compat.o v4l2-common.o
obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o
-obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8801.o cx8802.o \
+obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \
cx88-blackbird.o tveeprom.o
+
+# THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!!
+ifeq ($(CONFIG_VIDEO_ALSA),m)
+ cx8801-objs := cx8801.o
+ obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o
+endif
+
obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o