diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 01:08:11 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 01:08:11 -0200 |
| commit | 47c9bdaf6e07f0a4b5ccaec663d41aec4bf62e63 (patch) | |
| tree | 40c30a3a55122a33867122d2e2937ceb20af95ff /v4l | |
| parent | ee189d9d96dcebde4ec27edbda3f1582949ca8a4 (diff) | |
| parent | db7fcfc5c5821ff5568dd32c567e0c42488c503f (diff) | |
| download | mediapointer-dvb-s2-47c9bdaf6e07f0a4b5ccaec663d41aec4bf62e63.tar.gz mediapointer-dvb-s2-47c9bdaf6e07f0a4b5ccaec663d41aec4bf62e63.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 4 | ||||
| -rw-r--r-- | v4l/versions.txt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index f97274db1..2080aa29e 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -100,10 +100,6 @@ Makefile.media: ################################################# # CFLAGS configuration -ifeq ($(CONFIG_XC3028),m) - EXTRA_CFLAGS += -DCONFIG_XC3028=1 -endif - ifeq ($(CONFIG_DVB_FIRESAT),m) EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/ endif diff --git a/v4l/versions.txt b/v4l/versions.txt index 2b6f9f8d0..e2cb159b1 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -37,6 +37,7 @@ VIDEO_MXB VIDEO_DPC VIDEO_OVCAMCHIP TUNER_3036 +TUNER_XC2028 # Changes to usb_input.h, struct input_dev [2.6.15] @@ -58,7 +59,7 @@ VIDEO_PVRUSB2_SYSFS VIDEO_PVRUSB2_DEBUGIFC VIDEO_USBVISION -[2.6.12] +[2.6.11] VIDEO_VIVI VIDEO_DEV VIDEO_V4L1 @@ -177,6 +178,8 @@ DVB_LNBP21 DVB_ISL6421 DVB_TUNER_MT2060 DVB_TUNER_MT2131 +DVB_TDA827X +DVB_TDA18271 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER |