From a550d1ffb13c412ef15534bf63949634708c0f01 Mon Sep 17 00:00:00 2001
From: Gerd Knorr <devnull@localhost>
Date: Thu, 30 Sep 2004 12:21:15 +0000
Subject: - cx88: build dvb stuff only on 2.6.9. - saa7134: new card by Michael
 Rodriguez-Torrent. - bttv: remove check for cx88 boards.

---
 v4l/Make.config | 3 +++
 v4l/Makefile    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Make.config b/v4l/Make.config
index 0464b1127..f9d2f3336 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -9,4 +9,7 @@ CONFIG_VIDEO_TVAUDIO	:= m
 
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
   CONFIG_VIDEO_CX88	:= m
+  ifeq (($SUBLEVEL),9)
+    CONFIG_VIDEO_CX88_DVB := m
+  endif
 endif
diff --git a/v4l/Makefile b/v4l/Makefile
index b96b3c781..ef88aa659 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -31,7 +31,8 @@ list-multi	:= bttv.o saa7134.o cx88xx.o cx8800.o cx8801.o cx8802.o
 obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
 obj-$(CONFIG_VIDEO_BTTV)	+= btcx-risc.o ir-common.o bttv.o
 obj-$(CONFIG_VIDEO_CX88)	+= btcx-risc.o cx88xx.o cx8800.o cx8801.o cx8802.o \
-                                   cx88-blackbird.o cx88-dvb.o cx22702.o
+                                   cx88-blackbird.o
+obj-$(CONFIG_VIDEO_CX88_DVB)	+= cx88-dvb.o cx22702.o
 obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134.o saa6752hs.o
 obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
 obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o
-- 
cgit v1.2.3