diff options
| author | Manu Abraham <manu@linuxtv.org> | 2006-03-17 21:01:39 +0400 |
|---|---|---|
| committer | Manu Abraham <manu@linuxtv.org> | 2006-03-17 21:01:39 +0400 |
| commit | b7434f34ac55e387cc42b901baaad41e19151814 (patch) | |
| tree | d5cc252c6e7b8c701500cb10d1aa3c24e45d8d47 | |
| parent | 154e4304bc7294ef18f516bf3c360306fb9ae5cf (diff) | |
| download | mediapointer-dvb-s2-b7434f34ac55e387cc42b901baaad41e19151814.tar.gz mediapointer-dvb-s2-b7434f34ac55e387cc42b901baaad41e19151814.tar.bz2 | |
fix Makefile and Kconfig
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/Makefile | 6 | ||||
| -rwxr-xr-x | v4l/scripts/cardlist | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index c90cd7099..84f27a6a8 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -16,6 +16,8 @@ config VIDEO_ADV_DEBUG V4L devices. In doubt, say N. +source "drivers/media/video/bt8xx/Kconfig" + config VIDEO_SAA6588 tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" depends on VIDEO_DEV && I2C && VIDEO_BT848 diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index c280b7caa..d21cb68f0 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -12,8 +12,8 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o -obj-$(CONFIG_VIDEO_BT848) += bt8xx/ bttv.o tvaudio.o \ - tda7432.o tda9875.o ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_BT848) += bt8xx/ +obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o obj-$(CONFIG_VIDEO_ZR36120) += zoran.o @@ -64,4 +64,4 @@ obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o obj-$(CONFIG_VIDEO_CX25840) += cx25840/ -EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core -I$(srctree)/drivers/media/video +EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index e368e6b4f..901d3fb18 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -1,6 +1,6 @@ #!/bin/sh -scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/video/bttv-cards.c \ +scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/media/video/bt8xx/bttv-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ |