- saa7134 reorganiation for modular mpeg2 stuff

- splitted some generic dvb code into the new video-buf-dvb module.

1 files changed, 6 insertions, 10 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index ef88aa659..1c9ed9ded 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -20,7 +20,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-cards.o saa7134-ts.o saa7134-input.o
 cx88xx-objs     := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o
 cx8800-objs     := cx88-video.o cx88-vbi.o
 cx8801-objs     := cx88-alsa.o
@@ -32,25 +32,21 @@ 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
-obj-$(CONFIG_VIDEO_CX88_DVB)	+= cx88-dvb.o cx22702.o
-obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134.o saa6752hs.o
+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
 obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o
 
+obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+
 # 2.6-only stuff
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
   ifeq ($(CONFIG_VIDEO_BTTV),m)
     bttv-objs			+= bttv-gpio.o
     obj-$(CONFIG_VIDEO_IR)	+= ir-kbd-gpio.o ir-kbd-i2c.o 
   endif
-endif
-
-# ir for saa7134
-ifeq ($(CONFIG_VIDEO_IR),m)
-  EXTRA_CFLAGS	+= -DCONFIG_VIDEO_IR=1
-  saa7134-objs	+= saa7134-input.o
-  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+  ifeq ($(CONFIG_VIDEO_SAA7134),m)
     obj-$(CONFIG_VIDEO_IR)	+= ir-kbd-i2c.o 
   endif
 endif