diff options
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/Makefile | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-gpio.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-i2c.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-if.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-input.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-risc.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-vbi.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 1 |
12 files changed, 3 insertions, 13 deletions
diff --git a/linux/drivers/media/video/bt8xx/Kconfig b/linux/drivers/media/video/bt8xx/Kconfig index 085477c12..153f6a4a9 100644 --- a/linux/drivers/media/video/bt8xx/Kconfig +++ b/linux/drivers/media/video/bt8xx/Kconfig @@ -1,6 +1,6 @@ config VIDEO_BT848 tristate "BT848 Video For Linux" - depends on VIDEO_DEV && PCI && I2C + depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 select I2C_ALGOBIT select FW_LOADER select VIDEO_BTCX diff --git a/linux/drivers/media/video/bt8xx/Makefile b/linux/drivers/media/video/bt8xx/Makefile index 94350f21c..a096a0341 100644 --- a/linux/drivers/media/video/bt8xx/Makefile +++ b/linux/drivers/media/video/bt8xx/Makefile @@ -8,5 +8,5 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ obj-$(CONFIG_VIDEO_BT848) += bttv.o -EXTRA_CFLAGS += -I$(src)/.. -EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core +EXTRA_CFLAGS += -Idrivers/media/video +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index f3e3c624d..b11967fa5 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -1,5 +1,4 @@ /* - $Id: bttv-cards.c,v 1.111 2006/01/19 18:14:20 mkrufky Exp $ bttv-cards.c diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 9586f91e3..7c819c5b9 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -1,5 +1,4 @@ /* - $Id: bttv-driver.c,v 1.87 2006/01/15 09:35:15 mchehab Exp $ bttv - Bt848 frame grabber driver diff --git a/linux/drivers/media/video/bt8xx/bttv-gpio.c b/linux/drivers/media/video/bt8xx/bttv-gpio.c index 8682662b3..b6eb7eea9 100644 --- a/linux/drivers/media/video/bt8xx/bttv-gpio.c +++ b/linux/drivers/media/video/bt8xx/bttv-gpio.c @@ -1,5 +1,4 @@ /* - $Id: bttv-gpio.c,v 1.12 2006/01/15 23:19:19 mchehab Exp $ bttv-gpio.c -- gpio sub drivers diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c index 6576bd3b1..0558ee220 100644 --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c @@ -1,5 +1,4 @@ /* - $Id: bttv-i2c.c,v 1.42 2006/01/12 13:09:55 mchehab Exp $ bttv-i2c.c -- all the i2c code is here diff --git a/linux/drivers/media/video/bt8xx/bttv-if.c b/linux/drivers/media/video/bt8xx/bttv-if.c index d264e0e53..c286f5db7 100644 --- a/linux/drivers/media/video/bt8xx/bttv-if.c +++ b/linux/drivers/media/video/bt8xx/bttv-if.c @@ -1,5 +1,4 @@ /* - $Id: bttv-if.c,v 1.5 2005/10/16 12:13:58 mchehab Exp $ bttv-if.c -- old gpio interface to other kernel modules don't use in new code, will go away in 2.7 diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c index 8a619ddb1..bab7cb123 100644 --- a/linux/drivers/media/video/bt8xx/bttv-input.c +++ b/linux/drivers/media/video/bt8xx/bttv-input.c @@ -1,5 +1,4 @@ /* - * $Id: bttv-input.c,v 1.7 2006/01/18 20:21:46 nsh Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek diff --git a/linux/drivers/media/video/bt8xx/bttv-risc.c b/linux/drivers/media/video/bt8xx/bttv-risc.c index 4401d7320..824e17d2a 100644 --- a/linux/drivers/media/video/bt8xx/bttv-risc.c +++ b/linux/drivers/media/video/bt8xx/bttv-risc.c @@ -1,5 +1,4 @@ /* - $Id: bttv-risc.c,v 1.12 2005/10/16 12:34:29 mchehab Exp $ bttv-risc.c -- interfaces to other kernel modules diff --git a/linux/drivers/media/video/bt8xx/bttv-vbi.c b/linux/drivers/media/video/bt8xx/bttv-vbi.c index 35a8f0d69..8c9f0f7cf 100644 --- a/linux/drivers/media/video/bt8xx/bttv-vbi.c +++ b/linux/drivers/media/video/bt8xx/bttv-vbi.c @@ -1,5 +1,4 @@ /* - $Id: bttv-vbi.c,v 1.10 2005/12/14 22:05:02 hverkuil Exp $ bttv - Bt848 frame grabber driver vbi interface diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h index 563b4fb61..88b72b8a3 100644 --- a/linux/drivers/media/video/bt8xx/bttv.h +++ b/linux/drivers/media/video/bt8xx/bttv.h @@ -1,5 +1,4 @@ /* - * $Id: bttv.h,v 1.38 2006/01/15 23:19:19 mchehab Exp $ * * bttv - Bt848 frame grabber driver * diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index a6fa1511a..70158aa5f 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -1,5 +1,4 @@ /* - $Id: bttvp.h,v 1.32 2006/01/15 09:35:15 mchehab Exp $ bttv - Bt848 frame grabber driver |