diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-23 14:24:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:01:05 -0500 |
commit | 215b95baf969c6f895969f0a4ae0479954fba7cd (patch) | |
tree | 67e02c71a7d306cb82221e674325a27221ce5e06 /drivers/media/video/Makefile | |
parent | 3b20532c791399182bd04f0fcc70b60a95637fa5 (diff) |
V4L/DVB (6430): Convert tuner-xc2028 driver to the newer hybrid approach
This changeset converts tuner-xc2028 to the newer hybrid approach. It also
prevents creating twice the xc3028 private struct by both DVB and V4L parts.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/Makefile')
-rw-r--r-- | drivers/media/video/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 1fd775e0a0b0..08ac197cc1dd 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -6,10 +6,6 @@ zr36067-objs := zoran_procfs.o zoran_device.o \ | |||
6 | zoran_driver.o zoran_card.o | 6 | zoran_driver.o zoran_card.o |
7 | tuner-objs := tuner-core.o tuner-types.o tda9887.o | 7 | tuner-objs := tuner-core.o tuner-types.o tda9887.o |
8 | 8 | ||
9 | ifneq ($(CONFIG_TUNER_XC2028),) | ||
10 | tuner-objs += tuner-xc2028.o | ||
11 | endif | ||
12 | |||
13 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 9 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
14 | 10 | ||
15 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o \ | 11 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o \ |
@@ -85,6 +81,7 @@ obj-$(CONFIG_TUNER_3036) += tuner-3036.o | |||
85 | 81 | ||
86 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o | 82 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o |
87 | 83 | ||
84 | obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o | ||
88 | obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o | 85 | obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o |
89 | obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o | 86 | obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o |
90 | obj-$(CONFIG_TUNER_TDA8290) += tda8290.o | 87 | obj-$(CONFIG_TUNER_TDA8290) += tda8290.o |