From 6de66fc86dee706f81addaad380002538f65219c Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 25 Mar 2006 22:18:49 -0600
Subject: Include additional pvrusb2 object files in build

From: Mike Isely <isely@pobox.com>

Some new sources have been added into pvrusb2 to deal with cx25840 and
wm8775 modules in V4L.  Need to add them to the build.

Signed-off-by: Mike Isely <isely@pobox.com>
---
 v4l/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index ab94f891f..039d71bce 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -72,6 +72,7 @@ pvrusb2-objs		:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
 			   pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \
 			   pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \
 			   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
+			   pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
 			   pvrusb2-ioread.o pvrusb2-debugifc.o
 dvb-firesat-objs	:= firesat.o avc_api.o cmp.o firesat-rc.o
 ivtv-objs		:= ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \
-- 
cgit v1.2.3


From 1513c16af8fe4dd3f0afa6548cb39331c24bd01d Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 26 Mar 2006 08:53:06 -0300
Subject: Some cleanups at make xconfig

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, it doesn't depend on kernel Kconfig stuff:
  - It generates a Kconfig.kern based on unsolved dependencies.
  - It assumes that all needed dependencies were compiled as module.

Only Multimedia tree is showed to the user.

To work, user should have runned xconfig before at the normal kernel tree.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile                |  4 +--
 v4l/scripts/make_kconfig.pl | 67 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 57 insertions(+), 14 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index ab94f891f..66e3eb31f 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -355,8 +355,8 @@ all:: default
 default:: links .version
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
-qconfig:: links .version
-	./scripts/make_kconfig.pl /usr/src/linux-2.6.14 $(ARCH)
+xconfig:: links .version
+	./scripts/make_kconfig.pl $(ARCH)
 	$(KDIR)/scripts/kconfig/qconf Kconfig
 
 ivtv-checkout::
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index f612e83db..91c37693f 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -1,37 +1,80 @@
 #!/usr/bin/perl
 use FileHandle;
 
-my $KDIR=shift;
 my $ARCH=shift;
 
+my %depend = ();
+my %config = ();
+
+sub add_config($)
+{
+	my $arg=shift;
+
+	if ($arg =~ m/^([A-Z0-9_]+)/) {
+		$config{$1} = 1;
+	}
+}
+
+sub check_deps($)
+{
+	my $arg=shift;
+	$arg=$arg." ";
+
+	while ($arg ne "") {
+		if ($arg =~ m/^([A-Z0-9_]+) /) {
+			my $val=$1;
+			my $prev=$depend{$val};
+			$depend { $val } = 1+$prev;
+		}
+		$arg =~ s/^[^ ]+ //;
+	}
+}
+
 sub open_kconfig($$) {
 	my ($dir,$file)=@_;
 	my $in = new FileHandle;
 
-print "opening $file\n";
+#print "opening $file\n";
 	open $in,"$file";
 	while (<$in>) {
-		if (m;^\s*source[\s\"]+drivers/media/(video|dvb)/Kconfig;) {
-			next;
-		}
+#		if (m;^\s*source[\s\"]+drivers/media/(video|dvb)/Kconfig;) {
+#			next;
+#		}
 		if (m|^\s*source[\s\"]+([^\n\s\"]+)[\n\s\"]|) {
 			open_kconfig($dir,"$dir/$1");
 			next;
 		}
+		if (m|^\s+depends on (.*)\n|) {
+			check_deps ($1);
+		}
+		if (m|^\s+select (.*)\n|) {
+			check_deps ($1);
+		}
+		if (m|^\s*config (.*)\n|) {
+			add_config ($1);
+		}
+
 		s/^main(menu\s\"[^\"]+)/\1 - DON'T CHANGE IT!/;
 		print OUT $_;
 	}
 	close $in;
 }
 
-open OUT,">Kconfig.kern";
-open_kconfig($KDIR,"$KDIR/arch/$ARCH/Kconfig");
-print OUT "endmenu\n";
-close OUT;
-
 open OUT,">Kconfig";
 print OUT "mainmenu \"V4L/DVB menu\"\n";
-open_kconfig ("../linux","../linux/drivers/media/video/Kconfig");
-open_kconfig ("../linux","../linux/drivers/media/dvb/Kconfig");
+
 print OUT "source Kconfig.kern\n";
+open_kconfig ("../linux","../linux/drivers/media/Kconfig");
+
 close OUT;
+
+while ( my ($key, $value) = each(%config) ) {
+		delete $depend{$key};
+}
+
+open OUT,">Kconfig.kern";
+while ( my ($key, $value) = each(%depend) ) {
+	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
+}
+close OUT;
+
-- 
cgit v1.2.3


From 903c36ebf540db31e1dc1348e3b13d91ba79faee Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 28 Mar 2006 23:23:48 +0200
Subject: Add wm8739 stereo audio ADC i2c driver

From: Hans Verkuil <hverkuil@xs4all.nl>

Add support for the Wolfson Microelectronics WM8739
stereo A/D converter from the ivtv driver.

Many thanks to Takahiro Adachi for writing the original driver.

Signed-off-by: Takahiro Adachi <tadachi@tadachi-net.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 v4l/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 772cac951..a9c0d1fa5 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -115,7 +115,7 @@ obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134-oss.o
 obj-$(CONFIG_VIDEO_IR)		+= ir-common.o 
 obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o saa6588.o 
 obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o wm8775.o \
-				   cs53l32a.o tda7432.o tda9875.o
+				   wm8739.o cs53l32a.o tda7432.o tda9875.o
 obj-$(CONFIG_VIDEO_CPIA2)       += cpia2.o
 
 obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx88-vp3054-i2c.o
@@ -309,7 +309,7 @@ endif
 inst_common := ir-common.ko
 inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko
 #inst_video += bt87x.ko
-inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko
+inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko wm8739.ko cs53l32a.ko
 inst_video += video-buf.ko video-buf-dvb.ko 
 inst_video += videodev.ko
 inst_video += ir-kbd-i2c.ko msp3400.ko
-- 
cgit v1.2.3


From 256280a989a5688161c66f97a3e054749875a723 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 29 Mar 2006 19:56:17 +0200
Subject: Add new NEC uPD64031A and uPD64083 i2c drivers

From: Hans Verkuil <hverkuil@xs4all.nl>

- Add support for the uPD64031A NEC Electronics Ghost Reduction i2c device
- Add support for the uPD6408x NEC Electronics 3-Dimensional Y/C separation
  i2c device.

Signed-off-by: Takahiro Adachi <tadachi@tadachi-net.com>
Signed-off-by: Takeru Komoriya <komoriya@paken.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 v4l/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index a9c0d1fa5..0b14488ee 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -99,7 +99,8 @@ obj-$(CONFIG_VIDEO_CX88)	+= btcx-risc.o cx88xx.o cx8800.o cx8802.o \
 obj-$(CONFIG_VIDEO_CX88_IVTV)	+= cx88-ivtv.o
 obj-$(CONFIG_TVP5150)		+= tvp5150.o
 obj-$(CONFIG_EM28XX)		+= em28xx.o tveeprom.o
-obj-$(CONFIG_VIDEO_DECODER)	+= saa7115.o cx25840.o saa7127.o bt832.o
+obj-$(CONFIG_VIDEO_DECODER)	+= saa7115.o cx25840.o saa7127.o bt832.o \
+				   upd64031a.o upd64083.o
 
 ifeq ($(CONFIG_VIDEO_ALSA),y)
   EXTRA_CFLAGS += -DUSING_CX88_ALSA=1
@@ -315,6 +316,7 @@ inst_video += videodev.ko
 inst_video += ir-kbd-i2c.ko msp3400.ko
 inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko
 inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko
+inst_video += upd64031a.ko upd64083.ko
 inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko
 inst_video += vivi.ko
 inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko
-- 
cgit v1.2.3


From cbea0cdfe46b67fb696b0a045e8ace7dddf4ca49 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 1 Apr 2006 20:36:50 -0600
Subject: Split out PVR USB2 model 24xxx hardware support to a config option

From: Mike Isely <isely@pobox.com>

Since there are lingering stability problems with support of the newer
PVR USB2 model 24xxx series hardware, I have isolate those changes
with a config option.  This commit leaves that option off.


Signed-off-by: Mike Isely <isely@pobox.com>
---
 v4l/Make.config | 2 ++
 v4l/Makefile    | 9 +++++++++
 2 files changed, 11 insertions(+)

(limited to 'v4l')

diff --git a/v4l/Make.config b/v4l/Make.config
index 7d8ae8e8d..98df1af83 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -20,6 +20,8 @@ CONFIG_VIDEO_ALSA	:= y
 CONFIG_VIDEO_ADV_DEBUG	:= y
 
 CONFIG_VIDEO_PVRUSB2	:= m
+CONFIG_VIDEO_PVRUSB2_SYSFS := y
+CONFIG_VIDEO_PVRUSB2_DEBUGIFC := y
 
 CONFIG_VIDEO_IVTV	:= n
 
diff --git a/v4l/Makefile b/v4l/Makefile
index 0b14488ee..da000e5d6 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -74,6 +74,15 @@ pvrusb2-objs		:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
 			   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
 			   pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
 			   pvrusb2-ioread.o pvrusb2-debugifc.o
+ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS
+endif
+ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC
+endif
+ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
+endif
 dvb-firesat-objs	:= firesat.o avc_api.o cmp.o firesat-rc.o
 ivtv-objs		:= ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \
 			   ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \
-- 
cgit v1.2.3


From b05a756090fe5f60143b64a780785ede6e8ac856 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 1 Apr 2006 20:47:32 -0600
Subject: Move pvrusb2 config switches further down in v4l's Makefile

From: Mike Isely <isely@pobox.com>

Cosmetic change related to pvrusb2 to ease maintenance of the v4l build.

Signed-off-by: Mike Isely <isely@pobox.com>
---
 v4l/Makefile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index da000e5d6..3a26fbdbe 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -74,15 +74,6 @@ pvrusb2-objs		:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
 			   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
 			   pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
 			   pvrusb2-ioread.o pvrusb2-debugifc.o
-ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
-endif
 dvb-firesat-objs	:= firesat.o avc_api.o cmp.o firesat-rc.o
 ivtv-objs		:= ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \
 			   ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \
@@ -233,6 +224,17 @@ $(obj)/av7110_firm.h:	$(obj)/fdump
 EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
 
+# for pvrusb2
+ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS
+endif
+ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC
+endif
+ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
+endif
+
 ifeq ($(ARCH),)
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 				-e s/arm.*/arm/ -e s/sa110/arm/ \
-- 
cgit v1.2.3


From 0f63e48ac1d9cbb7c9783b4c4ff4ce94e8ef34cb Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 2 Apr 2006 18:07:04 -0400
Subject: add missing modules to install target

From: Michael Krufky <mkrufky@linuxtv.org>

- added dib3000-common.ko to inst_frontends
- added dvb-usb-dibusb-common.ko to inst_dvb-usb

Thanks to: Martin Dauskardt <md001@gmx.de>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 3a26fbdbe..a66036f68 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -336,8 +336,8 @@ inst_em28xx := em28xx.ko
 inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
 inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
 inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
-inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko
-inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko 
+inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko bcm3510.ko
+inst_frontends += dib3000-common.ko dib3000mb.ko dib3000mc.ko ves1820.ko 
 inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko 
 inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko
 inst_frontends += stv0297_cs2.ko zl10353.ko
@@ -346,8 +346,8 @@ inst_saa7146 := saa7146.ko saa7146_vv.ko
 inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko
 inst_cinergyT2 := cinergyT2.ko
 inst_dvb-usb := dvb-usb.ko dvb-usb-vp7045.ko dvb-usb-vp702x.ko
-inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-dibusb-mb.ko
-inst_dvb-usb += dvb-usb-dibusb-mc.ko dvb-usb-nova-t-usb2.ko
+inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-nova-t-usb2.ko
+inst_dvb-usb += dvb-usb-dibusb-common.ko dvb-usb-dibusb-mc.ko dvb-usb-dibusb-mb.ko
 inst_dvb-usb += dvb-usb-umt-010.ko dvb-usb-digitv.ko dvb-usb-cxusb.ko
 inst_pluto2 := pluto2.ko
 inst_ttpci := budget-core.ko budget.ko ttpci-eeprom.ko budget-av.ko
-- 
cgit v1.2.3


From d90bd3ff0cbd895065afc24bb83501e97c844cd0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 7 Apr 2006 19:05:42 -0300
Subject: Big changes at v4l-dvb make internal working

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Previously, tree building were based on Make.config. This file contained all
compiling stuff. Also, v4l/Makefile contained all drivers that should be
copiled, replicating the rules of all other Makefiles under linux.
Now, make will rely on linux/*/Makefile to compile the modules. This approach
allows usage of Kconfig files, allowing partial compilations.

Newer makefile commands introduced:

make allmodconfig - Selects all stuff to be compiled as module;
make config - Selects packages via text interface;
make xconfig - Selects packages via qt interface;
make gconfig - selects packages via gtk interface.

for config, xconfig and gconfig to be used, those scripts needs to be previously
compiled at kernel. So, user needs to use those commands previously at kernel tree.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Make.config              | 121 -------------------
 v4l/Makefile                 | 274 +++++--------------------------------------
 v4l/Makefile.kern24          |  28 +++++
 v4l/scripts/make_kconfig.pl  |  73 +++++++++++-
 v4l/scripts/make_makefile.pl | 109 +++++++++++++++++
 v4l/scripts/make_noconfig.pl |  60 ++++++++++
 v4l/versions.txt             | 152 ++++++++++++++++++++++++
 7 files changed, 450 insertions(+), 367 deletions(-)
 delete mode 100644 v4l/Make.config
 create mode 100644 v4l/Makefile.kern24
 create mode 100644 v4l/scripts/make_makefile.pl
 create mode 100644 v4l/scripts/make_noconfig.pl
 create mode 100644 v4l/versions.txt

(limited to 'v4l')

diff --git a/v4l/Make.config b/v4l/Make.config
deleted file mode 100644
index 98df1af83..000000000
--- a/v4l/Make.config
+++ /dev/null
@@ -1,121 +0,0 @@
-MDIR			:= v4l2
-snap			:= video4linux
-
-CONFIG_VIDEO_BTTV	:= m
-CONFIG_VIDEO_SAA7134	:= m
-CONFIG_VIDEO_IR		:= m
-CONFIG_VIDEO_TUNER	:= m
-CONFIG_VIDEO_TVAUDIO	:= m
-CONFIG_VIDEO_CX88	:= m
-
-CONFIG_TVP5150		:= m
-
-#enable experimental support for xc3028 tuner
-CONFIG_XC3028		:= m
-
-CONFIG_VIDEO_DECODER    := m
-
-CONFIG_VIDEO_ALSA	:= y
-
-CONFIG_VIDEO_ADV_DEBUG	:= y
-
-CONFIG_VIDEO_PVRUSB2	:= m
-CONFIG_VIDEO_PVRUSB2_SYSFS := y
-CONFIG_VIDEO_PVRUSB2_DEBUGIFC := y
-
-CONFIG_VIDEO_IVTV	:= n
-
-CONFIG_DVB_FIRESAT	:= n
-
-CONFIG_VIRTUAL_DEVICE   := m
-CONFIG_VIDEO_CPIA2	:= m
-
-CONFIG_VIDEO_CX88_IVTV	:= n
-
-CONFIG_VIDEO_MXB        := m
-
-# doesn't build on older kernels
-
-CONFIG_DVB_CORE			:= n
-CONFIG_VIDEO_BUF_DVB		:= n
-CONFIG_VIDEO_CX88_DVB		:= n
-CONFIG_VIDEO_SAA7134_DVB	:= n
-
-# requires dvb-core
-
-CONFIG_DVB_BT8XX		:= n
-CONFIG_DVB_FRONTENDS		:= n
-CONFIG_DVB_B2C2_FLEXCOP		:= n
-CONFIG_DVB_B2C2_FLEXCOP_PCI	:= n
-CONFIG_DVB_B2C2_FLEXCOP_USB	:= n
-CONFIG_DVB_CINERGYT2		:= n
-CONFIG_DVB_USB			:= n
-CONFIG_DVB_USB_VP7045		:= n
-CONFIG_DVB_USB_VP702X		:= n
-CONFIG_DVB_USB_DTT200U		:= n
-CONFIG_DVB_USB_A800		:= n
-CONFIG_DVB_USB_DIBUSB_MB	:= n
-CONFIG_DVB_USB_DIBUSB_MC	:= n
-CONFIG_DVB_USB_NOVA_T_USB2	:= n
-CONFIG_DVB_USB_UMT_010		:= n
-CONFIG_DVB_USB_DIGITV		:= n
-CONFIG_DVB_USB_CXUSB		:= n
-CONFIG_DVB_PLUTO2		:= n
-CONFIG_DVB_BUDGET		:= n
-CONFIG_DVB_BUDGET_AV		:= n
-CONFIG_DVB_BUDGET_CI		:= n
-CONFIG_DVB_BUDGET_PATCH		:= n
-CONFIG_DVB_AV7110		:= n
-CONFIG_DVB_TTUSB_BUDGET		:= n
-CONFIG_DVB_TTUSB_DEC		:= n
-CONFIG_VIDEO_SAA7146		:= n
-CONFIG_VIDEO_SAA7146_VV		:= n
-
-ifneq ($(KERNELRELEASE),)
- CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m)
- CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m)
- CONFIG_VIDEO_DEV := $(shell test $(PATCHLEVEL) -ge 6 && echo m)
- CONFIG_EM28XX    := $(shell test $(PATCHLEVEL) -ge 6 && echo m)
-endif
-
-ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
- CONFIG_VIDEO_CX88_DVB		:= m
- CONFIG_VIDEO_SAA7134_DVB	:= m
-endif
-
-ifeq ($(CONFIG_DVB_CORE),m)
- CONFIG_DVB_BT8XX		:= m
- CONFIG_DVB_FRONTENDS		:= m
- CONFIG_DVB_B2C2_FLEXCOP	:= m
- CONFIG_DVB_B2C2_FLEXCOP_PCI	:= m
- CONFIG_DVB_B2C2_FLEXCOP_USB	:= m
- CONFIG_DVB_CINERGYT2		:= m
- CONFIG_DVB_USB			:= m
- CONFIG_DVB_USB_VP7045		:= m
- CONFIG_DVB_USB_VP702X		:= m
- CONFIG_DVB_USB_DTT200U		:= m
- CONFIG_DVB_USB_A800		:= m
- CONFIG_DVB_USB_DIBUSB_MB	:= m
- CONFIG_DVB_USB_DIBUSB_MC	:= m
- CONFIG_DVB_USB_NOVA_T_USB2	:= m
- CONFIG_DVB_USB_UMT_010		:= m
- CONFIG_DVB_USB_DIGITV		:= m
- CONFIG_DVB_USB_CXUSB		:= m
- CONFIG_DVB_PLUTO2		:= m
- CONFIG_DVB_BUDGET		:= m
- CONFIG_DVB_BUDGET_AV		:= m
- CONFIG_DVB_BUDGET_CI		:= m
- CONFIG_DVB_BUDGET_PATCH	:= m
- CONFIG_DVB_AV7110		:= m
- CONFIG_DVB_AV7110_OSD		:= y
-# Uncomment the next two lines to compile the av7110 firmware into the driver.
-# CONFIG_DVB_AV7110_FIRMWARE	:= y
-# CONFIG_DVB_AV7110_FIRMWARE_FILE := /path/to/firmware/dvb-ttpci-01.fw
- CONFIG_DVB_TTUSB_BUDGET	:= m
- CONFIG_DVB_TTUSB_DEC		:= m
- CONFIG_VIDEO_SAA7146		:= m
- CONFIG_VIDEO_SAA7146_VV	:= m
-endif
-
-CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m)
-CONFIG_VIDEO_CX88_IVTV := $(if $(wildcard $(src)/cx88-ivtv.c),m)
diff --git a/v4l/Makefile b/v4l/Makefile
index a66036f68..1f9cfa05b 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -5,223 +5,23 @@ endif
 #################################################
 # configuration
 
-include $(obj)/Make.config
-
-# symbol exports
-export-objs	:= video-buf.o v4l1-compat.o v4l2-common.o
-export-objs	+= ir-common.o
-ifeq ($(CONFIG_VIDEO_DEV),m)
-export-objs     += videodev.o
-endif
-export-objs	+= bttv-if.o btcx-risc.o
-export-objs	+= cx88-cards.o cx88-core.o
-export-objs	+= saa7134-core.o saa7134-tvaudio.o
-
-# drivers objects
-ir-common-objs  := ir-keymaps.o ir-functions.o
-bttv-objs	:= bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \
-		   bttv-vbi.o bttv-i2c.o bttv-input.o
-saa7134-objs	:= saa7134-core.o saa7134-i2c.o saa7134-video.o \
-		   saa7134-vbi.o saa7134-tvaudio.o \
-		   saa7134-cards.o saa7134-ts.o saa7134-input.o
-
-
-cx88xx-objs	:= cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \
-		   cx88-input.o
-cx8800-objs	:= cx88-video.o cx88-vbi.o
-cx8802-objs	:= cx88-mpeg.o
-tuner-objs	:= tuner-core.o tuner-types.o tuner-simple.o mt20xx.o tda8290.o tea5767.o 
-ifeq ($(CONFIG_XC3028),m)
-tuner-objs	+= xc3028.o
-endif
-msp3400-objs	:= msp3400-driver.o msp3400-kthreads.o
-list-multi	:= bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o
-em28xx-objs	:= em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
-		   em28xx-input.o
-cx25840-objs    := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
-		   cx25840-vbi.o
-dvb-core-objs	:= dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \
-		   dvb_ca_en50221.o dvb_frontend.o \
-		   dvb_net.o dvb_ringbuffer.o
-b2c2-flexcop-objs	:= flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
-		   flexcop-sram.o flexcop-eeprom.o flexcop-misc.o \
-		   flexcop-hw-filter.o flexcop-dma.o
-b2c2-flexcop-pci-objs	:= flexcop-pci.o
-b2c2-flexcop-usb-objs	:= flexcop-usb.o
-dvb-usb-objs	:= dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o \
-		   dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o
-dvb-usb-vp7045-objs	:= vp7045.o vp7045-fe.o
-dvb-usb-vp702x-objs	:= vp702x.o vp702x-fe.o
-dvb-usb-dtt200u-objs	:= dtt200u.o dtt200u-fe.o
-dvb-usb-dibusb-common-objs	:= dibusb-common.o
-dvb-usb-a800-objs	:= a800.o
-dvb-usb-dibusb-mb-objs	:= dibusb-mb.o
-dvb-usb-dibusb-mc-objs	:= dibusb-mc.o
-dvb-usb-nova-t-usb2-objs	:= nova-t-usb2.o
-dvb-usb-umt-010-objs	:= umt-010.o
-dvb-usb-digitv-objs	:= digitv.o
-dvb-usb-cxusb-objs	:= cxusb.o
-dvb-ttpci-objs		:= av7110_hw.o av7110_v4l.o av7110_av.o \
-			   av7110_ca.o av7110.o av7110_ipack.o av7110_ir.o
-saa7146-objs		:= saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs		:= saa7146_vv_ksyms.o saa7146_fops.o \
-			   saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-pvrusb2-objs		:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
-			   pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \
-			   pvrusb2-encoder.o pvrusb2-video-v4l.o \
-			   pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \
-			   pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \
-			   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
-			   pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
-			   pvrusb2-ioread.o pvrusb2-debugifc.o
-dvb-firesat-objs	:= firesat.o avc_api.o cmp.o firesat-rc.o
-ivtv-objs		:= ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \
-			   ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \
-			   ivtv-irq.o ivtv-mailbox.o ivtv-vbi.o ivtv-kthreads.o \
-			   ivtv-audio.o ivtv-ioctl.o ivtv-controls.o ivtv-video.o \
-			   ivtv-cards.o ivtv-yuv.o
-ivtv-fb-objs		:= ivtv-osd.o ivtv-queue.o
-cpia2-objs		:= cpia2_core.o cpia2_usb.o cpia2_v4l.o
-
-obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
-obj-m				+= compat_ioctl32.o 
-ifeq ($(CONFIG_VIDEO_DEV),m)
-obj-m				+= videodev.o
-endif
-
-obj-$(CONFIG_VIDEO_MXB)		+= mxb.o tea6420.o tea6415c.o tda9840.o
-obj-$(CONFIG_VIDEO_DPC)		+= dpc7146.o
-obj-$(CONFIG_VIDEO_HEXIUM_ORION)+= hexium_orion.o
-obj-$(CONFIG_VIDEO_HEXIUM_GEMINI)+= hexium_gemini.o
-obj-$(CONFIG_VIDEO_BTTV)	+= btcx-risc.o ir-common.o bttv.o tveeprom.o
-obj-$(CONFIG_VIDEO_CX88)	+= btcx-risc.o cx88xx.o cx8800.o cx8802.o \
-				   cx88-blackbird.o tveeprom.o
-obj-$(CONFIG_VIDEO_CX88_IVTV)	+= cx88-ivtv.o
-obj-$(CONFIG_TVP5150)		+= tvp5150.o
-obj-$(CONFIG_EM28XX)		+= em28xx.o tveeprom.o
-obj-$(CONFIG_VIDEO_DECODER)	+= saa7115.o cx25840.o saa7127.o bt832.o \
-				   upd64031a.o upd64083.o
-
-ifeq ($(CONFIG_VIDEO_ALSA),y)
-  EXTRA_CFLAGS += -DUSING_CX88_ALSA=1
-  obj-$(CONFIG_VIDEO_CX88)	+= cx88-alsa.o
-  obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134-alsa.o 
-## This one is installed by ALSA as snd_bt87x
-#  obj-$(CONFIG_VIDEO_BTTV)	+= bt87x.o 
-endif
-
-obj-$(CONFIG_VIRTUAL_DEVICE)	+= vivi.o
-obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134.o saa7134-empress.o saa6752hs.o
-obj-$(CONFIG_VIDEO_SAA7134)	+= saa7134-oss.o
-obj-$(CONFIG_VIDEO_IR)		+= ir-common.o 
-obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o saa6588.o 
-obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o wm8775.o \
-				   wm8739.o cs53l32a.o tda7432.o tda9875.o
-obj-$(CONFIG_VIDEO_CPIA2)       += cpia2.o
-
-obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx88-vp3054-i2c.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
-obj-$(CONFIG_DVB_BT8XX)		+= bt878.o dvb-bt8xx.o dst.o dst_ca.o
-obj-$(CONFIG_DVB_FRONTENDS)	+= dvb-pll.o cx22702.o or51132.o lgdt330x.o \
-				   mt352.o tda1004x.o sp887x.o nxt6000.o \
-				   cx24110.o or51211.o nxt200x.o cx24123.o \
-				   mt312.o stv0299.o bcm3510.o \
-				   dib3000-common.o dib3000mb.o dib3000mc.o \
-				   ves1820.o cx22700.o tda8083.o ves1x93.o \
-				   stv0297.o sp8870.o l64781.o s5h1420.o \
-				   tda10021.o at76c651.o tda80xx.o zl10353.o
-obj-$(CONFIG_DVB_CORE)		+= dvb-core.o
-obj-$(CONFIG_DVB_B2C2_FLEXCOP)	+= b2c2-flexcop.o
-obj-$(CONFIG_DVB_B2C2_FLEXCOP)	+= stv0297_cs2.o
-obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
-obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
-obj-$(CONFIG_DVB_CINERGYT2)	+= cinergyT2.o
-obj-$(CONFIG_DVB_PLUTO2)	+= pluto2.o
-obj-$(CONFIG_DVB_TTUSB_BUDGET)	+= dvb-ttusb-budget.o
-obj-$(CONFIG_DVB_TTUSB_DEC)	+= ttusb_dec.o ttusbdecfe.o
-obj-$(CONFIG_DVB_USB)		+= dvb-usb.o
-obj-$(CONFIG_DVB_USB_VP7045)	+= dvb-usb-vp7045.o
-obj-$(CONFIG_DVB_USB_VP702X)	+= dvb-usb-vp702x.o
-obj-$(CONFIG_DVB_USB_DTT200U)	+= dvb-usb-dtt200u.o
-obj-$(CONFIG_DVB_USB_A800)	+= dvb-usb-dibusb-common.o dvb-usb-a800.o
-obj-$(CONFIG_DVB_USB_DIBUSB_MB)	+= dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o
-obj-$(CONFIG_DVB_USB_DIBUSB_MC)	+= dvb-usb-dibusb-common.o dvb-usb-dibusb-mc.o
-obj-$(CONFIG_DVB_USB_NOVA_T_USB2)	+= dvb-usb-dibusb-common.o \
-					   dvb-usb-nova-t-usb2.o
-obj-$(CONFIG_DVB_USB_UMT_010)	+= dvb-usb-dibusb-common.o dvb-usb-umt-010.o
-obj-$(CONFIG_DVB_USB_DIGITV)	+= dvb-usb-digitv.o
-obj-$(CONFIG_DVB_USB_CXUSB)	+= dvb-usb-cxusb.o
-obj-$(CONFIG_DVB_BUDGET)	+= budget-core.o budget.o ttpci-eeprom.o
-obj-$(CONFIG_DVB_BUDGET_AV)	+= budget-core.o budget-av.o ttpci-eeprom.o
-obj-$(CONFIG_DVB_BUDGET_CI)	+= budget-core.o budget-ci.o ttpci-eeprom.o
-obj-$(CONFIG_DVB_BUDGET_PATCH)	+= budget-core.o budget-patch.o ttpci-eeprom.o
-obj-$(CONFIG_DVB_AV7110)	+= dvb-ttpci.o ttpci-eeprom.o
-obj-$(CONFIG_VIDEO_SAA7146)	+= saa7146.o
-obj-$(CONFIG_VIDEO_SAA7146_VV)	+= saa7146_vv.o
-obj-$(CONFIG_VIDEO_PVRUSB2)	+= pvrusb2.o
-obj-$(CONFIG_DVB_FIRESAT)       += dvb-firesat.o
-obj-$(CONFIG_VIDEO_IVTV)        += ivtv.o ivtv-fb.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-i2c.o 
-  endif
-  ifeq ($(CONFIG_VIDEO_SAA7134),m)
-    obj-$(CONFIG_VIDEO_IR)	+= ir-kbd-i2c.o 
-  endif
-endif
-
-ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1
-endif
-
-ifeq ($(CONFIG_XC3028),m)
- EXTRA_CFLAGS += -DCONFIG_XC3028=1
-endif
+-include $(obj)/.myconfig
+-include $(obj)/Makefile.media
 
 # for DVB
 EXTRA_CFLAGS += -DDVB_CVS=1
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
 ifeq ($(CONFIG_DVB_FIRESAT),m)
- EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
-endif
-ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
- EXTRA_CFLAGS += -DHAVE_CX22702=1
- EXTRA_CFLAGS += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_LGDT330X=1
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_ZL10353=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
- EXTRA_CFLAGS += -DHAVE_CX24123=1
- EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1
-endif
-ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_TDA1004X=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
+  EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
 endif
+
 ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
  EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
 endif
-ifeq ($(CONFIG_DVB_AV7110_OSD),y)
- EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1
-endif
-ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
-src := $(PWD)
-
-$(src)/av7110.c:	$(obj)/av7110_firm.h
 
-$(obj)/fdump:
-	$(CC) -o $@ $(src)/fdump.c
-
-$(obj)/av7110_firm.h:	$(obj)/fdump
-	$(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@
-
-EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
+ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
+  EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
 
 # for pvrusb2
@@ -235,17 +35,10 @@ ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
  EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
 endif
 
-ifeq ($(ARCH),)
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-				-e s/arm.*/arm/ -e s/sa110/arm/ \
-				-e s/s390x/s390/ -e s/parisc64/parisc/ )
-endif
-
 #################################################
 # compile modules
 
 ifneq ($(KERNELRELEASE),)
-
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  export-objs	:=
  list-multi	:=
@@ -266,33 +59,7 @@ SNAPSHOT_CFLAGS	:= -DSNAPSHOT='$(shell cat $(snapshot))'
 EXTRA_CFLAGS	+= $(SNAPSHOT_CFLAGS)
 endif
 
-#
-# Need to compile with kernel 2.4
-#
-bttv.o: $(bttv-objs)
-	$(LD) -r -o $@ $(bttv-objs)
-
-cx25840.o: $(cx25840-objs)
-	$(LD) -g -r -o $@ $(cx25840-objs)
-
-cx8800.o: $(cx8800-objs)
-	$(LD) -g -r -o $@ $(cx8800-objs)
-
-cx8802.o: $(cx8802-objs)
-	$(LD) -g -r -o $@ $(cx8802-objs)
-
-cx88xx.o: $(cx88xx-objs)
-	$(LD) -g -r -o $@ $(cx88xx-objs)
-
-em28xx.o: $(em28xx-objs)
-	$(LD) -g -r -o $@ $(em28xx-objs)
-
-saa7134.o: $(saa7134-objs)
-	$(LD) -g -r -o $@ $(saa7134-objs)
-
-tuner.o: $(tuner-objs)
-	$(LD) -g -r -o $@ $(tuner-objs)
-
+include $(obj)/Makefile.kern24
 -include $(TOPDIR)/Rules.make
 else
 # take version info from last module build if available
@@ -366,12 +133,33 @@ export LC_ALL
 
 all:: default
 
-default:: links .version
+Makefile.media::
+	scripts/make_makefile.pl
+
+default:: Makefile.media links .version
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
 xconfig:: links .version
-	./scripts/make_kconfig.pl $(ARCH)
+	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/qconf Kconfig
+	./scripts/make_noconfig.pl
+
+gconfig:: links .version
+	./scripts/make_kconfig.pl
+	$(KDIR)/scripts/kconfig/gconf Kconfig
+	./scripts/make_noconfig.pl
+
+config:: links .version
+	./scripts/make_kconfig.pl
+	$(KDIR)/scripts/kconfig/conf Kconfig
+	./scripts/make_noconfig.pl
+
+allmodconfig:: links .version
+	./scripts/make_kconfig.pl
+	$(KDIR)/scripts/kconfig/conf -m Kconfig
+	cat .config|grep -v CONFIG_DVB_AV7110_FIRMWARE >.config.new
+	mv .config.new .config
+	./scripts/make_noconfig.pl
 
 ivtv-checkout::
 	@if [ ! -d ivtv ]; then \
@@ -557,7 +345,7 @@ clean::
 		Kconfig Kconfig.kern .config .config.cmd
 
 distclean:: clean
-	-rm -f .version .*.o.flags .*.o.d
+	-rm -f .version .*.o.flags .*.o.d Makefile.media
 	-rm -rf .tmp_versions
 	@find .. -name '*.orig' -exec rm '{}' \;
 	@find .. -name '*.rej' -exec rm '{}' \;
diff --git a/v4l/Makefile.kern24 b/v4l/Makefile.kern24
new file mode 100644
index 000000000..2bab09aee
--- /dev/null
+++ b/v4l/Makefile.kern24
@@ -0,0 +1,28 @@
+#
+# Need to compile with kernel 2.4
+#
+
+bttv.o: $(bttv-objs)
+	$(LD) -r -o $@ $(bttv-objs)
+
+cx25840.o: $(cx25840-objs)
+	$(LD) -g -r -o $@ $(cx25840-objs)
+
+cx8800.o: $(cx8800-objs)
+	$(LD) -g -r -o $@ $(cx8800-objs)
+
+cx8802.o: $(cx8802-objs)
+	$(LD) -g -r -o $@ $(cx8802-objs)
+
+cx88xx.o: $(cx88xx-objs)
+	$(LD) -g -r -o $@ $(cx88xx-objs)
+
+em28xx.o: $(em28xx-objs)
+	$(LD) -g -r -o $@ $(em28xx-objs)
+
+saa7134.o: $(saa7134-objs)
+	$(LD) -g -r -o $@ $(saa7134-objs)
+
+tuner.o: $(tuner-objs)
+	$(LD) -g -r -o $@ $(tuner-objs)
+
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 91c37693f..b1d6f5d53 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 use FileHandle;
 
-my $ARCH=shift;
-
 my %depend = ();
+my %minver = ();
 my %config = ();
+my $version, $level, $sublevel;
 
 sub add_config($)
 {
@@ -33,6 +33,7 @@ sub check_deps($)
 sub open_kconfig($$) {
 	my ($dir,$file)=@_;
 	my $in = new FileHandle;
+	my $skip=0;
 
 #print "opening $file\n";
 	open $in,"$file";
@@ -51,15 +52,78 @@ sub open_kconfig($$) {
 			check_deps ($1);
 		}
 		if (m|^\s*config (.*)\n|) {
+			my $key=$1;
+
 			add_config ($1);
+
+			my $min=$minver { $key };
+			my $minversion, $minlevel, $minsublevel;
+			if ($min =~ m/(\d+)\.(\d+)\.(\d+)/) {
+				$minversion=$1;
+				$minlevel=$2;
+				$minsublevel=$3;
+			} else {
+				die "Minimum version for $key not found at versions.txt";
+			}
+			if ( ($version < $minversion) |
+				($level < $minlevel) |
+				($sublevel < $minsublevel) ) {
+				$skip=1;
+				printf "$key requires version $minversion.$minlevel.$minsublevel\n";
+
+				print OUT "# $key disabled due to incorrect version\nconfig $key\n\ttristate\n\tdefault n\n\n";
+				next;
+			} else {
+#				printf "OK: $key requires version $minversion.$minlevel.$minsublevel\n";
+				$skip=0;
+			}
 		}
 
 		s/^main(menu\s\"[^\"]+)/\1 - DON'T CHANGE IT!/;
-		print OUT $_;
+		if (m/^[\w]/) {
+			$skip=0;
+		}
+		if (!$skip) {
+			print OUT $_;
+		}
+	}
+	close $in;
+}
+
+sub parse_versions ()
+{
+	my $in = new FileHandle;
+	my $ver;
+
+	open $in,"versions.txt";
+	while (<$in>) {
+		if (m/\[([\d.]*)\]/) {
+			$ver=$1;
+			next;
+		}
+		s/\n//;
+		if (m/^\s*([\w\d_]+)/) {
+			$minver { $1 } = $ver;
+#			printf ("%s=%s\n",$1,$ver);
+		}
 	}
 	close $in;
 }
 
+parse_versions;
+
+open IN,".version";
+while (<IN>) {
+	if (m/KERNELRELEASE\s*[:]*[=]+\s*(\d+)\.(\d+)\.(\d+)/) {
+		$version=$1;
+		$level=$2;
+		$sublevel=$3;
+	}
+}
+close IN;
+
+printf "Preparing to compile for kernel version %d.%d.%d\n",$version,$level,$sublevel;
+
 open OUT,">Kconfig";
 print OUT "mainmenu \"V4L/DVB menu\"\n";
 
@@ -73,6 +137,9 @@ while ( my ($key, $value) = each(%config) ) {
 }
 
 open OUT,">Kconfig.kern";
+
+print OUT "config MODULES\n\tboolean\n\tdefault y\n\n";
+
 while ( my ($key, $value) = each(%depend) ) {
 	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
 }
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
new file mode 100644
index 000000000..135b8bdb1
--- /dev/null
+++ b/v4l/scripts/make_makefile.pl
@@ -0,0 +1,109 @@
+#!/usr/bin/perl
+use FileHandle;
+
+sub check_line($$$)
+{
+	my $dir=shift;
+	my $obj=shift;
+	my $arg=shift;
+	my $arg2="";
+
+	$arg=$arg." ";
+
+	while ($arg ne "") {
+		if ($arg =~ m|^([^ /]+)/ |) {
+			my $newdir=$1;
+#			print "include $dir/$newdir/Makefile\n";
+			open_makefile("$dir/$newdir/Makefile");
+			$arg =~ s/^[^ ]+ //;
+		} else {
+			$arg =~ s/^([^ ]+ )//;
+			$arg2 = $arg2.$1;
+		}
+	}
+	$arg2 =~ s/\s+$//;
+	if ($arg2 ne "") {
+#			print "arg=$arg2\n";
+		print OUT "$obj$arg2\n";
+	}
+}
+
+sub remove_includes($$)
+{
+	my $obj=shift;
+	my $arg=shift;
+	my $arg2="";
+
+	$arg=$arg." ";
+
+	while ($arg ne "") {
+		if (!$arg =~ m|^(-I\s*[^ ]+) |) {
+			$arg2 = $arg2.$1;
+			$arg =~ s|^[^ ] ||;
+		} else {
+			$arg =~ s|^(-I\s*[^ ]+) ||;
+		}
+	}
+	if ($arg2 ne "") {
+		print OUT "$obj$arg2\n";
+	}
+}
+
+sub open_makefile($) {
+	my $file= shift;
+	my $in = new FileHandle;
+	my $dir= "";
+	my $count=0;
+
+	$file=~ m|^(.*)/[^/]*$|;
+	$dir=$1;
+
+#print "opening $file (dir=$dir)\n";
+	open $in,"$file";
+
+	while (<$in>) {
+		if (m|\s*#|) {
+			print OUT $_;
+			next;
+		}
+		if (m|^\s*include|) {
+			next;
+		}
+		if (count==1 || m|(^\s*EXTRA_CFLAGS.*=\s*)(.*/.*)\n|) {
+			remove_includes($1,$2);
+			if (m|[\\]\n|) {
+				$count=1;
+			} else {
+				$count=0;
+			}
+			next;
+		}
+#		if (m|(^\s*obj.*=\s*)(.*/.*)\n|) {
+		if (count==2 || m|(^\s*obj.*=\s*)(.*)\n|) {
+			check_line($dir,$1,$2);
+			if (m|\\\n|) {
+				$count=1;
+			} else {
+				$count=0;
+			}
+			next;
+		}
+		print OUT $_;
+	}
+	close $in;
+}
+
+open OUT,">Makefile.media";
+open_makefile ("../linux/drivers/media/Makefile");
+close OUT;
+
+while ( my ($key, $value) = each(%config) ) {
+		delete $depend{$key};
+}
+
+open OUT,">Kconfig.kern";
+while ( my ($key, $value) = each(%depend) ) {
+	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
+}
+close OUT;
+
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
new file mode 100644
index 000000000..503653a4f
--- /dev/null
+++ b/v4l/scripts/make_noconfig.pl
@@ -0,0 +1,60 @@
+#!/usr/bin/perl
+
+my $config = ();
+
+open IN,".config";
+while (<IN>) {
+	if (m/\s*([\d\w_]+)[=](.*)\n/) {
+#printf "%s=%s\n",$1,$2;
+		$config { $1 } = $2;		
+	}
+}
+close IN;
+
+open IN,".version";
+while (<IN>) {
+        if (m/KERNELRELEASE\s*[:]*[=]+\s*(\d+)\.(\d+)\.(\d+)/) {
+                $version=$1;
+                $level=$2;
+                $sublevel=$3;
+        }
+}
+close IN;
+
+open IN,"versions.txt";
+while (<IN>) {
+	if (m/\[(\d+)\.(\d+)\.(\d+)\]/) {
+		$minversion=$1;
+		$minlevel=$2;
+		$minsublevel=$3;
+		next;
+	}
+	s/\n//;
+
+	if (m/DVB_AV7110_FIRMWARE/) {
+		next;
+	}
+	if (m/DVB_AV7110_FIRMWARE_FILE/) {
+		next;
+	}
+	if (m/^\s*([\w\d_]+)/) {
+		if ( ($version < $minversion) |
+		     ($level < $minlevel) |
+		     ($sublevel < $minsublevel) ) {
+			$config { "CONFIG_$1" } = 'n';
+#print "CONFIG_$1 version is not supported\n";
+			next;
+		}
+		if (!($config { "CONFIG_$1" } ) ) {
+print "CONFIG_$1 is unset\n";
+			$config { "CONFIG_$1" } = 'n';
+		}
+	}
+}
+close IN;
+
+open OUT,">.myconfig";
+while ( my ($key, $value) = each(%config) ) {
+	printf OUT "%-44s := %s\n",$key,$value;
+}
+close OUT;
diff --git a/v4l/versions.txt b/v4l/versions.txt
new file mode 100644
index 000000000..b4e4809af
--- /dev/null
+++ b/v4l/versions.txt
@@ -0,0 +1,152 @@
+# Use this for stuff not yet at V4L/DVB tree
+[2.6.99]
+VIDEO_ZORAN
+VIDEO_ZORAN_BUZ
+VIDEO_ZORAN_DC10
+VIDEO_ZORAN_DC30
+VIDEO_ZORAN_LML33
+VIDEO_ZORAN_LML33R10
+VIDEO_ZR36120
+VIDEO_SAA5246A
+VIDEO_SAA5249
+VIDEO_BWQCAM
+VIDEO_CQCAM
+VIDEO_W9966
+VIDEO_PMS
+VIDEO_STRADIS
+VIDEO_CPIA
+VIDEO_CPIA_PP
+VIDEO_CPIA_USB
+VIDEO_MEYE
+VIDEO_MXB
+VIDEO_DPC
+TUNER_3036
+USB_DABUSB
+USB_DSBR
+USB_OV511
+USB_SE401
+USB_STV680
+USB_W9968CF
+VIDEO_PLANB
+VIDEO_VINO
+VIDEO_M32R_AR_M64278
+VIDEO_M32R_AR
+
+[2.6.12]
+VIDEO_DEV
+VIDEO_ADV_DEBUG
+VIDEO_BT848
+VIDEO_BT848_DVB
+VIDEO_SAA6588
+VIDEO_CPIA2
+VIDEO_SAA7134
+VIDEO_SAA7134_ALSA
+VIDEO_SAA7134_OSS
+VIDEO_SAA7134_DVB
+VIDEO_SAA7134_DVB_ALL_FRONTENDS
+VIDEO_SAA7134_DVB_MT352
+VIDEO_SAA7134_DVB_TDA1004X
+VIDEO_SAA7134_DVB_NXT200X
+VIDEO_HEXIUM_ORION
+VIDEO_HEXIUM_GEMINI
+VIDEO_CX88_VP3054
+VIDEO_CX88
+VIDEO_CX88_ALSA
+VIDEO_CX88_DVB
+VIDEO_CX88_DVB_ALL_FRONTENDS
+VIDEO_CX88_DVB_MT352
+VIDEO_CX88_DVB_VP3054
+VIDEO_CX88_DVB_ZL10353
+VIDEO_CX88_DVB_OR51132
+VIDEO_CX88_DVB_CX22702
+VIDEO_CX88_DVB_LGDT330X
+VIDEO_CX88_DVB_NXT200X
+VIDEO_CX88_DVB_CX24123
+VIDEO_OVCAMCHIP
+VIDEO_MSP3400
+VIDEO_CS53L32A
+VIDEO_WM8775
+VIDEO_WM8739
+VIDEO_CX25840
+VIDEO_SAA711X
+VIDEO_SAA7127
+VIDEO_UPD64031A
+VIDEO_UPD64083
+VIDEO_PVRUSB2
+VIDEO_PVRUSB2_24XXX
+VIDEO_PVRUSB2_SYSFS
+VIDEO_PVRUSB2_DEBUGIFC
+VIDEO_EM28XX
+DVB
+DVB_CORE
+DVB_AV7110
+DVB_AV7110_FIRMWARE
+DVB_AV7110_FIRMWARE_FILE
+DVB_AV7110_OSD
+DVB_BUDGET
+DVB_BUDGET_CI
+DVB_BUDGET_AV
+DVB_BUDGET_PATCH
+DVB_USB
+DVB_USB_DEBUG
+DVB_USB_A800
+DVB_USB_DIBUSB_MB
+DVB_USB_DIBUSB_MB_FAULTY
+DVB_USB_DIBUSB_MC
+DVB_USB_UMT_010
+DVB_USB_CXUSB
+DVB_USB_DIGITV
+DVB_USB_VP7045
+DVB_USB_VP702X
+DVB_USB_NOVA_T_USB2
+DVB_USB_DTT200U
+DVB_TTUSB_BUDGET
+DVB_TTUSB_DEC
+DVB_CINERGYT2
+DVB_CINERGYT2_TUNING
+DVB_CINERGYT2_STREAM_URB_COUNT
+DVB_CINERGYT2_STREAM_BUF_SIZE
+DVB_CINERGYT2_QUERY_INTERVAL
+DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
+DVB_CINERGYT2_RC_QUERY_INTERVAL
+DVB_B2C2_FLEXCOP
+DVB_B2C2_FLEXCOP_PCI
+DVB_B2C2_FLEXCOP_USB
+DVB_B2C2_FLEXCOP_DEBUG
+DVB_BT8XX
+DVB_PLUTO2
+DVB_STV0299
+DVB_CX24110
+DVB_CX24123
+DVB_TDA8083
+DVB_MT312
+DVB_VES1X93
+DVB_S5H1420
+DVB_SP8870
+DVB_SP887X
+DVB_CX22700
+DVB_CX22702
+DVB_L64781
+DVB_TDA1004X
+DVB_NXT6000
+DVB_MT352
+DVB_ZL10353
+DVB_DIB3000MB
+DVB_DIB3000MC
+DVB_VES1820
+DVB_TDA10021
+DVB_STV0297
+DVB_NXT200X
+DVB_OR51211
+DVB_OR51132
+DVB_BCM3510
+DVB_LGDT330X
+VIDEO_SAA7146
+VIDEO_SAA7146_VV
+VIDEO_VIDEOBUF
+VIDEO_TUNER
+VIDEO_BUF
+VIDEO_BUF_DVB
+VIDEO_BTCX
+VIDEO_IR
+VIDEO_TVEEPROM
-- 
cgit v1.2.3


From 8e830d2f4fd6b430ec05e6dd6ec98d32aa2d0fc6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 7 Apr 2006 19:10:14 -0300
Subject: Now, make all will replicate old behavior

From: Mauro Carvalho Chehab <mchehab@infradead.org>

make all will do allmodconfig before compiling

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile                 | 2 +-
 v4l/scripts/make_makefile.pl | 0
 v4l/scripts/make_noconfig.pl | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 v4l/scripts/make_makefile.pl
 mode change 100644 => 100755 v4l/scripts/make_noconfig.pl

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 1f9cfa05b..df88eda8e 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -131,7 +131,7 @@ v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 LC_ALL = POSIX
 export LC_ALL
 
-all:: default
+all:: allmodconfig default
 
 Makefile.media::
 	scripts/make_makefile.pl
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
old mode 100644
new mode 100755
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 23b6caa1b7a386cc3bac43085a6e1e743d934ea2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 7 Apr 2006 22:20:49 -0300
Subject: improved make method

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, "make all" will compile all stuff. just make will
make with the options generated by one make config methods.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index df88eda8e..e0dbb6cef 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -131,14 +131,14 @@ v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 LC_ALL = POSIX
 export LC_ALL
 
+default:: Makefile.media links .version
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
+
 all:: allmodconfig default
 
 Makefile.media::
 	scripts/make_makefile.pl
 
-default:: Makefile.media links .version
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
-
 xconfig:: links .version
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/qconf Kconfig
-- 
cgit v1.2.3


From 672521a35cb79a8a1ae4de74f446ed1ae73a31b2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 7 Apr 2006 23:28:55 -0300
Subject: Added almost all other V4L missing drivers to the tree

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, drivers/media tree is complete. Only missing zoran36120
since this won't work and it is a good candidate to be removed
from kernel soon.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/.myconfig    | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 v4l/versions.txt |  41 ++++++++++--
 2 files changed, 234 insertions(+), 5 deletions(-)
 create mode 100644 v4l/.myconfig

(limited to 'v4l')

diff --git a/v4l/.myconfig b/v4l/.myconfig
new file mode 100644
index 000000000..0a99a2b66
--- /dev/null
+++ b/v4l/.myconfig
@@ -0,0 +1,198 @@
+CONFIG_SND                                   := m
+CONFIG_VIDEO_BWQCAM                          := m
+CONFIG_VIDEO_SAA7146                         := m
+CONFIG_VIDEO_SAA7146_VV                      := m
+CONFIG_VIDEO_CX88_DVB_VP3054                 := n
+CONFIG_VIDEO_DPC                             := m
+CONFIG_DVB_TTUSB_BUDGET                      := m
+CONFIG_VIDEO_SAA7134_DVB_NXT200X             := n
+CONFIG_VIDEO_EM28XX                          := m
+CONFIG_VIDEO_CX88_VP3054                     := m
+CONFIG_VIDEO_CX88_DVB_NXT200X                := n
+CONFIG_DVB_CINERGYT2                         := m
+CONFIG_VIDEO_WM8775                          := m
+CONFIG_VIDEO_SAA7134_DVB_MT352               := n
+CONFIG_DVB_USB_DIGITV                        := m
+CONFIG_VIDEO_CPIA_USB                        := m
+CONFIG_VIDEO_BT848                           := m
+CONFIG_I2C_ALGOBIT                           := m
+CONFIG_RADIO_ZOLTRIX_PORT                    := n
+CONFIG_DVB_TTUSB_DEC                         := m
+CONFIG_DVB_SP8870                            := m
+CONFIG_USB_OV511                             := m
+CONFIG_VIDEO_PVRUSB2_24XXX                   := y
+CONFIG_RADIO_MAESTRO                         := m
+CONFIG_DVB_S5H1420                           := m
+CONFIG_RADIO_MIROPCM20                       := m
+CONFIG_I2C                                   := m
+CONFIG_DVB_NXT200X                           := m
+CONFIG_DVB_TDA10021                          := m
+CONFIG_DVB_CORE                              := m
+CONFIG_VIDEO_PVRUSB2_SYSFS                   := y
+CONFIG_VIDEO_CX88_DVB_LGDT330X               := n
+CONFIG_VIDEO_UPD64083                        := m
+CONFIG_USB_DABUSB                            := m
+CONFIG_DVB_DIB3000MC                         := m
+CONFIG_DVB_PLUTO2                            := m
+CONFIG_RADIO_GEMTEK_PCI                      := m
+CONFIG_DVB_TDA1004X                          := m
+CONFIG_VIDEO_SAA711X                         := m
+CONFIG_DVB_BT8XX                             := m
+CONFIG_VIDEO_CQCAM                           := m
+CONFIG_VIDEO_CX88_DVB_OR51132                := n
+CONFIG_TUNER_3036                            := m
+CONFIG_USB_SE401                             := m
+CONFIG_DVB_L64781                            := m
+CONFIG_VIDEO_BUF_DVB                         := m
+CONFIG_DVB_USB_DTT200U                       := m
+CONFIG_DVB_CINERGYT2_QUERY_INTERVAL          := 250
+CONFIG_RADIO_TRUST                           := m
+CONFIG_VIDEO_HEXIUM_ORION                    := m
+CONFIG_VIDEO_CX88_DVB_CX22702                := n
+CONFIG_VIDEO_CX88_ALSA                       := m
+CONFIG_DVB_SP887X                            := m
+CONFIG_DVB_STV0297                           := m
+CONFIG_DVB_CX22700                           := m
+CONFIG_VIDEO_SAA7134                         := m
+CONFIG_VIDEO_WM8739                          := m
+CONFIG_VIDEO_VIDEOBUF                        := m
+CONFIG_DVB_MT352                             := m
+CONFIG_INET                                  := m
+CONFIG_USB_STV680                            := m
+CONFIG_SOUND_ACI_MIXER                       := m
+CONFIG_VIDEO_MSP3400                         := m
+CONFIG_VIDEO_SAA5249                         := m
+CONFIG_VIDEO_STRADIS                         := m
+CONFIG_VIDEO_ZORAN_DC10                      := m
+CONFIG_DVB_MT312                             := m
+CONFIG_VIDEO_PLANB                           := n
+CONFIG_VIDEO_TUNER                           := m
+CONFIG_VIDEO_ADV_DEBUG                       := y
+CONFIG_VIDEO_ZORAN_LML33R10                  := m
+CONFIG_DVB_B2C2_FLEXCOP_DEBUG                := y
+CONFIG_USB                                   := m
+CONFIG_VIDEO_PMS                             := m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY              := y
+CONFIG_DVB_CX22702                           := m
+CONFIG_VIDEO_MEYE                            := m
+CONFIG_VIDEO_HEXIUM_GEMINI                   := m
+CONFIG_FW_LOADER                             := m
+CONFIG_RADIO_MAXIRADIO                       := m
+CONFIG_PROC_FS                               := m
+CONFIG_RADIO_AZTECH                          := m
+CONFIG_PCI                                   := m
+CONFIG_RADIO_RTRACK2_PORT                    := n
+CONFIG_DVB_OR51211                           := m
+CONFIG_DVB_NXT6000                           := m
+CONFIG_DVB_USB_NOVA_T_USB2                   := m
+CONFIG_DVB_USB_VP702X                        := m
+CONFIG_VIDEO_SAA7127                         := m
+CONFIG_DVB_ZL10353                           := m
+CONFIG_VIDEO_SAA7134_ALSA                    := m
+CONFIG_RADIO_AZTECH_PORT                     := n
+CONFIG_DVB_B2C2_FLEXCOP_USB                  := m
+CONFIG_DVB_BUDGET_PATCH                      := m
+CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE  := y
+CONFIG_DVB_BUDGET                            := m
+CONFIG_VIDEO_CX88_DVB_CX24123                := n
+CONFIG_SGI_IP22                              := m
+CONFIG_RADIO_TYPHOON_PORT                    := n
+CONFIG_DVB_VES1820                           := m
+CONFIG_VIDEO_CX88_DVB                        := m
+CONFIG_DVB_BCM3510                           := m
+CONFIG_ISA                                   := m
+CONFIG_VIDEO_CS53L32A                        := m
+CONFIG_DVB_TDA8083                           := m
+CONFIG_VIDEO_ZORAN_LML33                     := m
+CONFIG_USB_DSBR                              := m
+CONFIG_VIDEO_SAA7134_DVB                     := m
+CONFIG_VIDEO_CX88_DVB_MT352                  := n
+CONFIG_SND_PCM                               := m
+CONFIG_DVB_B2C2_FLEXCOP                      := m
+CONFIG_RADIO_CADET                           := m
+CONFIG_SOUND_PRIME                           := m
+CONFIG_VIDEO_W9966                           := m
+CONFIG_USB_W9968CF                           := m
+CONFIG_VIDEO_IR                              := m
+CONFIG_VIDEO_M32R_AR                         := m
+CONFIG_DVB_USB_DEBUG                         := y
+CONFIG_DVB_CX24110                           := m
+CONFIG_DVB_BUDGET_CI                         := m
+CONFIG_SYSFS                                 := m
+CONFIG_DVB_STV0299                           := m
+CONFIG_VIDEO_CPIA2                           := m
+CONFIG_DVB_CINERGYT2_TUNING                  := y
+CONFIG_VIDEO_OVCAMCHIP                       := m
+CONFIG_RADIO_GEMTEK                          := m
+CONFIG_RADIO_SF16FMI                         := m
+CONFIG_RADIO_RTRACK_PORT                     := n
+CONFIG_DVB_BUDGET_AV                         := m
+CONFIG_MODULES                               := y
+CONFIG_PPC_PMAC                              := m
+CONFIG_PARPORT                               := m
+CONFIG_DVB_AV7110                            := m
+CONFIG_BROKEN                                := m
+CONFIG_DVB_B2C2_FLEXCOP_PCI                  := m
+CONFIG_M32R                                  := m
+CONFIG_NET                                   := m
+CONFIG_RADIO_SF16FMR2                        := m
+CONFIG_DVB_USB                               := m
+CONFIG_CRC32                                 := m
+CONFIG_VIDEO_VINO                            := n
+CONFIG_RADIO_TRUST_PORT                      := n
+CONFIG_DVB_OR51132                           := m
+CONFIG_DVB_USB_UMT_010                       := m
+CONFIG_VIDEO_TVEEPROM                        := m
+CONFIG_RADIO_TERRATEC                        := m
+CONFIG_RADIO_ZOLTRIX                         := m
+CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT        := 32
+CONFIG_RADIO_MIROPCM20_RDS                   := m
+CONFIG_VIDEO_ZORAN                           := m
+CONFIG_RADIO_TYPHOON_MUTEFREQ                := n
+CONFIG_VIDEO_CX88                            := m
+CONFIG_RADIO_RTRACK2                         := m
+CONFIG_SONYPI                                := m
+CONFIG_DVB_USB_DIBUSB_MC                     := m
+CONFIG_RADIO_TYPHOON_PROC_FS                 := y
+CONFIG_RADIO_GEMTEK_PORT                     := n
+CONFIG_DVB_DIB3000MB                         := m
+CONFIG_DVB_USB_VP7045                        := m
+CONFIG_DVB_USB_CXUSB                         := m
+CONFIG_VIDEO_BTCX                            := m
+CONFIG_VIDEO_ZR36120                         := n
+CONFIG_VIDEO_CPIA_PP                         := m
+CONFIG_DVB_USB_A800                          := m
+CONFIG_DVB                                   := y
+CONFIG_VIDEO_CPIA                            := m
+CONFIG_PARPORT_1284                          := m
+CONFIG_DVB_USB_DIBUSB_MB                     := m
+CONFIG_VIDEO_BUF                             := m
+CONFIG_VIDEO_BT848_DVB                       := y
+CONFIG_VIDEO_CX88_DVB_ZL10353                := n
+CONFIG_VIDEO_SAA6588                         := m
+CONFIG_DVB_CX24123                           := m
+CONFIG_RADIO_TYPHOON                         := m
+CONFIG_VIDEO_DEV                             := y
+CONFIG_I2C_ALGO_SGI                          := m
+CONFIG_DVB_VES1X93                           := m
+CONFIG_RADIO_TERRATEC_PORT                   := n
+CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS       := y
+CONFIG_VIDEO_SAA7134_DVB_TDA1004X            := n
+CONFIG_VIDEO_SAA7134_OSS                     := m
+CONFIG_EXPERIMENTAL                          := m
+CONFIG_VIDEO_UPD64031A                       := m
+CONFIG_DVB_LGDT330X                          := m
+CONFIG_VIDEO_ZORAN_BUZ                       := m
+CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL       := 50
+CONFIG_DVB_AV7110_OSD                        := y
+CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS          := y
+CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE         := 512
+CONFIG_VIDEO_M32R_AR_M64278                  := n
+CONFIG_VIDEO_ZORAN_DC30                      := m
+CONFIG_VIDEO_PVRUSB2_DEBUGIFC                := y
+CONFIG_VIDEO_MXB                             := m
+CONFIG_VIDEO_SAA5246A                        := m
+CONFIG_PLAT_M32700UT                         := m
+CONFIG_VIDEO_CX25840                         := m
+CONFIG_VIDEO_PVRUSB2                         := m
+CONFIG_RADIO_RTRACK                          := m
diff --git a/v4l/versions.txt b/v4l/versions.txt
index b4e4809af..60d4bdbad 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -1,12 +1,20 @@
-# Use this for stuff not yet at V4L/DVB tree
+# Use this for stuff for drivers that don't compile
 [2.6.99]
+# This is broken for a long time
+VIDEO_ZR36120
+
+# Those are architecture-dependent
+VIDEO_PLANB
+VIDEO_VINO
+VIDEO_M32R_AR_M64278
+
+[2.6.16]
 VIDEO_ZORAN
 VIDEO_ZORAN_BUZ
 VIDEO_ZORAN_DC10
 VIDEO_ZORAN_DC30
 VIDEO_ZORAN_LML33
 VIDEO_ZORAN_LML33R10
-VIDEO_ZR36120
 VIDEO_SAA5246A
 VIDEO_SAA5249
 VIDEO_BWQCAM
@@ -27,10 +35,33 @@ USB_OV511
 USB_SE401
 USB_STV680
 USB_W9968CF
-VIDEO_PLANB
-VIDEO_VINO
-VIDEO_M32R_AR_M64278
 VIDEO_M32R_AR
+RADIO_CADET
+RADIO_RTRACK
+RADIO_RTRACK_PORT
+RADIO_RTRACK2
+RADIO_RTRACK2_PORT
+RADIO_AZTECH
+RADIO_AZTECH_PORT
+RADIO_GEMTEK
+RADIO_GEMTEK_PORT
+RADIO_GEMTEK_PCI
+RADIO_MAXIRADIO
+RADIO_MAESTRO
+RADIO_MIROPCM20
+RADIO_MIROPCM20_RDS
+RADIO_SF16FMI
+RADIO_SF16FMR2
+RADIO_TERRATEC
+RADIO_TERRATEC_PORT
+RADIO_TRUST
+RADIO_TRUST_PORT
+RADIO_TYPHOON
+RADIO_TYPHOON_PROC_FS
+RADIO_TYPHOON_PORT
+RADIO_TYPHOON_MUTEFREQ
+RADIO_ZOLTRIX
+RADIO_ZOLTRIX_PORT
 
 [2.6.12]
 VIDEO_DEV
-- 
cgit v1.2.3


From 05b97b078973c39870f58b53238dca456d2b43d7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 8 Apr 2006 11:01:58 -0300
Subject: Fix make install

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Previous patch broke make install. This patch fix it.
Also, serveral cleanups were made at core Makefile.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile                 | 344 ++++++++++++++-----------------------------
 v4l/scripts/make_makefile.pl |  41 +++++-
 2 files changed, 146 insertions(+), 239 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index e0dbb6cef..f9c6fe516 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -3,11 +3,20 @@ obj = .
 endif
 
 #################################################
-# configuration
+# default compilation rule
+
+default:: Makefile.media links .version
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
+
+#################################################
+# Object specific rules
 
 -include $(obj)/.myconfig
 -include $(obj)/Makefile.media
 
+#################################################
+# CFLAGS configuration
+
 # for DVB
 EXTRA_CFLAGS += -DDVB_CVS=1
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
@@ -35,8 +44,12 @@ ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
  EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
 endif
 
+EXTRA_CFLAGS += -g
+
+EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
+
 #################################################
-# compile modules
+# Kernel 2.4/2.6 specific rules
 
 ifneq ($(KERNELRELEASE),)
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -48,10 +61,15 @@ else
  export-objs	:= $(filter $(int-m) $(obj-m),$(export-objs))
 endif
 
-CC += -I$(obj)
-EXTRA_CFLAGS += -g
+include $(obj)/Makefile.kern24
+-include $(TOPDIR)/Rules.make
+else
+# take version info from last module build if available
+-include $(obj)/.version
+endif
 
-EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
+#################################################
+# Directories to be used
 
 snapshot := $(wildcard $(obj)/.snapshot)
 ifneq ($(snapshot),)
@@ -59,19 +77,17 @@ SNAPSHOT_CFLAGS	:= -DSNAPSHOT='$(shell cat $(snapshot))'
 EXTRA_CFLAGS	+= $(SNAPSHOT_CFLAGS)
 endif
 
-include $(obj)/Makefile.kern24
--include $(TOPDIR)/Rules.make
-else
-# take version info from last module build if available
--include $(obj)/.version
-endif
-
 KDIR		:= /lib/modules/$(KERNELRELEASE)/build
 PWD		:= $(shell pwd)
 DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
 KDIR26		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/media
 KDIRUSB		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
 
+#################################################
+# Compiler fixup rules
+
+CC += -I$(obj)
+
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/
  MYCFLAGS :=
@@ -79,66 +95,96 @@ else
  MYCFLAGS := CFLAGS="-I../linux/include -D__KERNEL__ -I$(KDIR)/include -DEXPORT_SYMTAB"
 endif
 
+
+#################################################
 # which files to install?
+
 inst-m		:= $(wildcard *.ko)
 ifeq ($(inst-m),)
   inst-m	:= $(obj-m)
 endif
 
-inst_common := ir-common.ko
-inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko
-#inst_video += bt87x.ko
-inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko wm8739.ko cs53l32a.ko
-inst_video += video-buf.ko video-buf-dvb.ko 
-inst_video += videodev.ko
-inst_video += ir-kbd-i2c.ko msp3400.ko
-inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko
-inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko
-inst_video += upd64031a.ko upd64083.ko
-inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko
-inst_video += vivi.ko
-inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko
-inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
-inst_em28xx := em28xx.ko
-inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
-inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
-inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
-inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko bcm3510.ko
-inst_frontends += dib3000-common.ko dib3000mb.ko dib3000mc.ko ves1820.ko 
-inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko 
-inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko
-inst_frontends += stv0297_cs2.ko zl10353.ko
-inst_dvb-core := dvb-core.ko
-inst_saa7146 := saa7146.ko saa7146_vv.ko
-inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko
-inst_cinergyT2 := cinergyT2.ko
-inst_dvb-usb := dvb-usb.ko dvb-usb-vp7045.ko dvb-usb-vp702x.ko
-inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-nova-t-usb2.ko
-inst_dvb-usb += dvb-usb-dibusb-common.ko dvb-usb-dibusb-mc.ko dvb-usb-dibusb-mb.ko
-inst_dvb-usb += dvb-usb-umt-010.ko dvb-usb-digitv.ko dvb-usb-cxusb.ko
-inst_pluto2 := pluto2.ko
-inst_ttpci := budget-core.ko budget.ko ttpci-eeprom.ko budget-av.ko
-inst_ttpci += budget-ci.ko budget-patch.ko dvb-ttpci.ko
-inst_ttusb-budget := dvb-ttusb-budget.ko
-inst_ttusb-dec := ttusb_dec.ko ttusbdecfe.ko
-inst_pvrusb2 := pvrusb2.ko
-inst_firesat := dvb-firesat.ko
-inst_ivtv := ivtv.ko ivtv-fb.ko
-
 v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 
+#################################################
 # locales seem to cause trouble sometimes.
 LC_ALL = POSIX
 export LC_ALL
 
-default:: Makefile.media links .version
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
+
+#################################################
+# Generic wildcard rules
+
+%.asm: %.o
+	objdump -S $< > $@
+
+#################################################
+# all file compilation rule
 
 all:: allmodconfig default
 
+#################################################
+# Compiling preparation rules
+
 Makefile.media::
 	scripts/make_makefile.pl
 
+.version:
+ifneq ($(KERNELRELEASE),)
+	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+else
+	echo "No version yet."
+	uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+endif
+
+links::
+	@echo creating symbolic links...
+	@find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+	@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+
+kernel-links makelinks::
+	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
+
+#################################################
+# Cardlist updating rule
+
+card cardlist cardlists:
+	scripts/cardlist
+
+#################################################
+# Cleaning rules
+
+clean::
+	@find . -name '*.c' -type l -exec rm '{}' \;
+	@find . -name '*.h' -type l -exec rm '{}' \;
+	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
+		ivtv-svnversion.h \
+		Kconfig Kconfig.kern .config .config.cmd
+
+distclean:: clean
+	-rm -f .version .*.o.flags .*.o.d Makefile.media
+	-rm -rf .tmp_versions
+	@find .. -name '*.orig' -exec rm '{}' \;
+	@find .. -name '*.rej' -exec rm '{}' \;
+
+#################################################
+# Kernel module insert/removal rules
+
+rmmodules::
+	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
+
+insmod load::
+	scripts/insmod.sh load
+
+rmmod unload::
+	scripts/insmod.sh unload
+
+reload::
+	scripts/insmod.sh reload
+
+#################################################
+# Configuration rules
+
 xconfig:: links .version
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/qconf Kconfig
@@ -161,6 +207,9 @@ allmodconfig:: links .version
 	mv .config.new .config
 	./scripts/make_noconfig.pl
 
+#################################################
+# IVTV link rules
+
 ivtv-checkout::
 	@if [ ! -d ivtv ]; then \
 		echo retrieving the latest ivtv sources from ivtvdriver.org; \
@@ -186,91 +235,8 @@ cx88-ivtv::
 	@echo creating cx88-ivtv symbolic links...
 	@ln -sf ../v4l_experimental/cx88-ivtv.c .
 
-links::
-	@echo creating symbolic links...
-	@find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
-	@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
-
-#	@find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
-
-kernel-links makelinks::
-	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
-
-install:: v4l-install dvb-install
-
-v4l-install:: v4l-rminstall
-	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
-
-	@strip --strip-debug $(inst-m)
-
-	-install -d $(KDIR26)/common
-	-install -m 644 -c $(inst_common) $(KDIR26)/common
-
-	-install -d $(KDIR26)/video
-	-install -m 644 -c $(inst_video) $(KDIR26)/video
-
-	-install -d $(KDIR26)/video/cx88
-	-install -m 644 -c $(inst_cx88) $(KDIR26)/video/cx88
-
-	-install -d $(KDIR26)/video/saa7134
-	-install -m 644 -c $(inst_saa7134) $(KDIR26)/video/saa7134
-
-	-install -d $(KDIR26)/video/em28xx
-	-install -m 644 -c $(inst_em28xx) $(KDIR26)/video/em28xx
-
-	-install -d $(KDIR26)/video/pvrusb2
-	-install -m 644 -c $(inst_pvrusb2) $(KDIR26)/video/pvrusb2
-
-	-install -d $(KDIR26)/video/ivtv
-	-install -m 644 -c $(inst_ivtv) $(KDIR26)/video/ivtv
-
-#	-install -d $(KDIRUSB)
-#	-install -m 644 -c $(inst_usb) $(KDIRUSB)/
-
-	/sbin/depmod -a ${KERNELRELEASE}
-
-dvb-install:: dvb-rminstall
-	@echo -e "\nInstalling new DVB modules at corresponding Kernel dir..."
-
-	@strip --strip-debug $(inst-m)
-
-	-install -d $(KDIR26)/common
-	-install -m 644 -c $(inst_saa7146) $(KDIR26)/common
-
-	-install -d $(KDIR26)/dvb/frontends
-	-install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
-
-	-install -d $(KDIR26)/dvb/bt8xx
-	-install -m 644 -c $(inst_bt8xx) $(KDIR26)/dvb/bt8xx
-
-	-install -d $(KDIR26)/dvb/dvb-core
-	-install -m 644 -c $(inst_dvb-core) $(KDIR26)/dvb/dvb-core
-
-	-install -d $(KDIR26)/dvb/b2c2
-	-install -m 644 -c $(inst_b2c2) $(KDIR26)/dvb/b2c2
-
-	-install -d $(KDIR26)/dvb/cinergyT2
-	-install -m 644 -c $(inst_cinergyT2) $(KDIR26)/dvb/cinergyT2
-
-	-install -d $(KDIR26)/dvb/dvb-usb
-	-install -m 644 -c $(inst_dvb-usb) $(KDIR26)/dvb/dvb-usb
-
-	-install -d $(KDIR26)/dvb/pluto2
-	-install -m 644 -c $(inst_pluto2) $(KDIR26)/dvb/pluto2
-
-	-install -d $(KDIR26)/dvb/ttpci
-	-install -m 644 -c $(inst_ttpci) $(KDIR26)/dvb/ttpci
-
-	-install -d $(KDIR26)/dvb/ttusb-budget
-	-install -m 644 -c $(inst_ttusb-budget) $(KDIR26)/dvb/ttusb-budget
-
-	-install -d $(KDIR26)/dvb/ttusb-dec
-	-install -m 644 -c $(inst_ttusb-dec) $(KDIR26)/dvb/ttusb-dec
-
-	-install -d $(KDIR26)/dvb/firesat
-	-install -m 644 -c $(inst_firesat) $(KDIR26)/dvb/firesat
-
-	/sbin/depmod -a ${KERNELRELEASE}
+#################################################
+# Old instalation rule
 
 old-install:: rminstall
 	@echo -e "\nInstalling new V4L modules at $(DEST)..."
@@ -282,73 +248,8 @@ old-install:: rminstall
 
 	/sbin/depmod -a ${KERNELRELEASE}
 
-rminstall:: v4l-rminstall dvb-rminstall
-
-v4l-rminstall::
-	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-
-	-@rm -r $(DEST) \
-		$(addprefix $(KDIR26)/common/, $(inst_common)) \
-		$(addprefix $(KDIR26)/video/, $(inst_video)) \
-		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
-		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
-		$(addprefix $(KDIR26)/video/pvrusb2/, $(inst_pvrusb2)) \
-		$(addprefix $(KDIR26)/video/ivtv/, $(inst_ivtv)) \
-		$(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \
-		$(addprefix $(KDIRUSB)/, $(inst_em28xx)) \
-		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
-		$(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \
-		$(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \
-		$(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
-		$(addprefix $(KDIR26)/video/pvrusb2/, $(addsuffix .gz,$(inst_pvrusb2))) 2>/dev/null \
-		$(addprefix $(KDIR26)/video/ivtv/, $(addsuffix .gz,$(inst_ivtv))) 2>/dev/null \
-		$(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \
-		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null
-	@echo
-
-dvb-rminstall::
-	@echo -e "\nEliminating old DVB modules (errors on this step is not a problem).."
-
-	-@rm -r $(DEST) \
-		$(addprefix $(KDIR26)/dvb/bt8xx/, $(inst_bt8xx)) \
-		$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \
-		$(addprefix $(KDIR26)/dvb/dvb-core/, $(inst_dvb-core)) \
-		$(addprefix $(KDIR26)/dvb/b2c2/, $(inst_b2c2)) \
-		$(addprefix $(KDIR26)/dvb/cinergyT2/, $(inst_cinergyT2)) \
-		$(addprefix $(KDIR26)/dvb/dvb-usb/, $(inst_dvb-usb)) \
-		$(addprefix $(KDIR26)/dvb/pluto2/, $(inst_pluto2)) \
-		$(addprefix $(KDIR26)/dvb/ttpci/, $(inst_ttpci)) \
-		$(addprefix $(KDIR26)/dvb/ttusb-budget/, $(inst_ttusb-budget)) \
-		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(inst_ttusb-dec)) \
-		$(addprefix $(KDIR26)/dvb/firesat/, $(inst_firesat)) \
-		$(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \
-		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \
-		$(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) \
-		$(addprefix $(KDIR26)/dvb/b2c2/, $(addsuffix .gz,$(inst_b2c2))) \
-		$(addprefix $(KDIR26)/dvb/cinergyT2/, $(addsuffix .gz,$(inst_cinergyT2))) \
-		$(addprefix $(KDIR26)/dvb/dvb-usb/, $(addsuffix .gz,$(inst_dvb-usb))) \
-		$(addprefix $(KDIR26)/dvb/pluto2/, $(addsuffix .gz,$(inst_pluto2))) \
-		$(addprefix $(KDIR26)/dvb/ttpci/, $(addsuffix .gz,$(inst_ttpci))) \
-		$(addprefix $(KDIR26)/dvb/ttusb-budget/, $(addsuffix .gz,$(inst_ttusb-budget))) \
-		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) \
-		$(addprefix $(KDIR26)/dvb/firesat/, $(addsuffix .gz,$(inst_firesat))) 2>/dev/null
-	@echo
-
-rmmodules::
-	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
-
-clean::
-	@find . -name '*.c' -type l -exec rm '{}' \;
-	@find . -name '*.h' -type l -exec rm '{}' \;
-	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
-		ivtv-svnversion.h \
-		Kconfig Kconfig.kern .config .config.cmd
-
-distclean:: clean
-	-rm -f .version .*.o.flags .*.o.d Makefile.media
-	-rm -rf .tmp_versions
-	@find .. -name '*.orig' -exec rm '{}' \;
-	@find .. -name '*.rej' -exec rm '{}' \;
+#################################################
+# Tree management rules
 
 change changes changelog::
 	make -C .. changelog
@@ -362,26 +263,8 @@ commit cvscommit hgcommit::
 push::
 	make -C .. push
 
-insmod load::
-	scripts/insmod.sh load
-
-rmmod unload::
-	scripts/insmod.sh unload
-
-reload::
-	scripts/insmod.sh reload
-
-.version:
-ifneq ($(KERNELRELEASE),)
-	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
-else
-	echo "No version yet."
-	uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
-
-endif
-
 #################################################
-# build tarballs
+# build tarballs rules
 
 RPWD	:= $(shell cd .. && pwd)
 thisdir	:= $(notdir $(RPWD))
@@ -399,14 +282,3 @@ snapshot snap tarball: update distclean
 	(cd ..; tar czf $(snapdir)/$(snap)-$(date).tar.gz .)
 	cp ChangeLog /$(snapdir)/$(snap)-ChangeLog-$(date)
 	$(MAKE) -C $(snapdir)
-
-
-#################################################
-# other stuff
-
-%.asm: %.o
-	objdump -S $< > $@
-
-card cardlist cardlists:
-	scripts/cardlist
-
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 135b8bdb1..48552c425 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 use FileHandle;
 
+my $instdir = ();
+
 sub check_line($$$)
 {
 	my $dir=shift;
@@ -8,6 +10,10 @@ sub check_line($$$)
 	my $arg=shift;
 	my $arg2="";
 
+	my $idir = $dir;
+
+	$idir =~ s|^../linux/drivers/media/||;
+
 	$arg=$arg." ";
 
 	while ($arg ne "") {
@@ -18,7 +24,15 @@ sub check_line($$$)
 			$arg =~ s/^[^ ]+ //;
 		} else {
 			$arg =~ s/^([^ ]+ )//;
-			$arg2 = $arg2.$1;
+			my $cur=$1;
+			$arg2 = $arg2.$cur;
+			$cur =~ s/\s+$//;
+			$cur =~ s/\\$//;
+			$cur =~ s/\s+$//;
+			$cur =~ s/\.o$/.ko/;
+			if ( ($cur ne "") && (! ($instdir { $idir } =~ m/($cur) /))) {
+				$instdir { $idir } = $instdir { $idir }.$cur." ";
+			}
 		}
 	}
 	$arg2 =~ s/\s+$//;
@@ -95,10 +109,32 @@ sub open_makefile($) {
 
 open OUT,">Makefile.media";
 open_makefile ("../linux/drivers/media/Makefile");
+
+# Creating Install rule
+printf OUT "install::\n";
+printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
+
+while ( my ($key, $value) = each(%instdir) ) {
+	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\\n\"\n";
+	printf OUT "\t-install -d \$(KDIR26)/$key\n";
+	printf OUT "\t-install -m 644 -c $value \$(KDIR26)/$key\n\n";
+}
+
+# Creating Remove rule
+printf OUT "remove::\n";
+printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n";
+printf OUT "\t-rm -r \$(DEST)\n\n";
+
+while ( my ($key, $value) = each(%instdir) ) {
+	printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n";
+	printf OUT "\tcd \$(KDIR26)/$key\n";
+	printf OUT "\t-rm $value\n\n";
+}
+
 close OUT;
 
 while ( my ($key, $value) = each(%config) ) {
-		delete $depend{$key};
+	delete $depend{$key};
 }
 
 open OUT,">Kconfig.kern";
@@ -106,4 +142,3 @@ while ( my ($key, $value) = each(%depend) ) {
 	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
 }
 close OUT;
-
-- 
cgit v1.2.3


From b664cece1c397677d509fa9a41874464f5a44214 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 8 Apr 2006 11:47:00 -0300
Subject: Some cleanups at make install

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_makefile.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 48552c425..1063617a1 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -26,10 +26,12 @@ sub check_line($$$)
 			$arg =~ s/^([^ ]+ )//;
 			my $cur=$1;
 			$arg2 = $arg2.$cur;
+
 			$cur =~ s/\s+$//;
 			$cur =~ s/\\$//;
 			$cur =~ s/\s+$//;
 			$cur =~ s/\.o$/.ko/;
+
 			if ( ($cur ne "") && (! ($instdir { $idir } =~ m/($cur) /))) {
 				$instdir { $idir } = $instdir { $idir }.$cur." ";
 			}
@@ -115,9 +117,11 @@ printf OUT "install::\n";
 printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
-	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\\n\"\n";
+	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\"\n";
 	printf OUT "\t-install -d \$(KDIR26)/$key\n";
-	printf OUT "\t-install -m 644 -c $value \$(KDIR26)/$key\n\n";
+
+	printf OUT "\t\@files='$value'; ";
+	printf OUT "for i in \$\$files; do install -m 644 -c \$\$i \$(KDIR26)/$key; done\n\n";
 }
 
 # Creating Remove rule
@@ -127,8 +131,8 @@ printf OUT "\t-rm -r \$(DEST)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
 	printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n";
-	printf OUT "\tcd \$(KDIR26)/$key\n";
-	printf OUT "\t-rm $value\n\n";
+	printf OUT "\t\@files='$value'; ";
+	printf OUT "for i in \$\$files; do rm \$(KDIR26)/$key/\$\$i; done\n\n";
 }
 
 close OUT;
-- 
cgit v1.2.3


From f5a63349b2b9e0daf5c7a993792af521e3dda46f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 8 Apr 2006 16:05:48 -0300
Subject: Some cleanups at make install/make remove

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, it won't generate errors for non-compiled objects.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_makefile.pl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 1063617a1..17ef048e7 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -114,25 +114,32 @@ open_makefile ("../linux/drivers/media/Makefile");
 
 # Creating Install rule
 printf OUT "install::\n";
-printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
+#printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
-	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files\"\n";
-	printf OUT "\t-install -d \$(KDIR26)/$key\n";
+	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files:\"\n";
+	printf OUT "\t\@install -d \$(KDIR26)/$key\n";
 
 	printf OUT "\t\@files='$value'; ";
-	printf OUT "for i in \$\$files; do install -m 644 -c \$\$i \$(KDIR26)/$key; done\n\n";
+	printf OUT "for i in \$\$files;do if [ -e \$\$i ]; then echo -n \"\$\$i \";";
+	printf OUT " install -m 644 -c \$\$i \$(KDIR26)/$key; fi; done; echo;\n\n";
 }
 
 # Creating Remove rule
-printf OUT "remove::\n";
+printf OUT "remove rminstall::\n";
 printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n";
-printf OUT "\t-rm -r \$(DEST)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
-	printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files\\n\"\n";
+	printf OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$key files:\"\n";
 	printf OUT "\t\@files='$value'; ";
-	printf OUT "for i in \$\$files; do rm \$(KDIR26)/$key/\$\$i; done\n\n";
+
+	printf OUT "for i in \$\$files;do if [ -e \$(KDIR26)/$key/\$\$i ]; then ";
+	printf OUT "echo -n \"\$\$i \";";
+	printf OUT " rm \$(KDIR26)/$key/\$\$i; fi; done; ";
+
+	printf OUT "for i in \$\$files;do if [ -e \$(KDIR26)/$key/\$\$i.gz ]; then ";
+	printf OUT "echo -n \"\$\$i.gz \";";
+	printf OUT " rm \$(KDIR26)/$key/\$\$i.gz; fi; done; echo;\n\n";
 }
 
 close OUT;
-- 
cgit v1.2.3


From 8e43b1719bccf0441257cd803e36d75e34e55d9f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 13:02:02 -0300
Subject: If .myconfig is not found, make will do allmodconfig.

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/.myconfig                | 198 -------------------------------------------
 v4l/scripts/make_makefile.pl |   8 ++
 2 files changed, 8 insertions(+), 198 deletions(-)
 delete mode 100644 v4l/.myconfig

(limited to 'v4l')

diff --git a/v4l/.myconfig b/v4l/.myconfig
deleted file mode 100644
index 0a99a2b66..000000000
--- a/v4l/.myconfig
+++ /dev/null
@@ -1,198 +0,0 @@
-CONFIG_SND                                   := m
-CONFIG_VIDEO_BWQCAM                          := m
-CONFIG_VIDEO_SAA7146                         := m
-CONFIG_VIDEO_SAA7146_VV                      := m
-CONFIG_VIDEO_CX88_DVB_VP3054                 := n
-CONFIG_VIDEO_DPC                             := m
-CONFIG_DVB_TTUSB_BUDGET                      := m
-CONFIG_VIDEO_SAA7134_DVB_NXT200X             := n
-CONFIG_VIDEO_EM28XX                          := m
-CONFIG_VIDEO_CX88_VP3054                     := m
-CONFIG_VIDEO_CX88_DVB_NXT200X                := n
-CONFIG_DVB_CINERGYT2                         := m
-CONFIG_VIDEO_WM8775                          := m
-CONFIG_VIDEO_SAA7134_DVB_MT352               := n
-CONFIG_DVB_USB_DIGITV                        := m
-CONFIG_VIDEO_CPIA_USB                        := m
-CONFIG_VIDEO_BT848                           := m
-CONFIG_I2C_ALGOBIT                           := m
-CONFIG_RADIO_ZOLTRIX_PORT                    := n
-CONFIG_DVB_TTUSB_DEC                         := m
-CONFIG_DVB_SP8870                            := m
-CONFIG_USB_OV511                             := m
-CONFIG_VIDEO_PVRUSB2_24XXX                   := y
-CONFIG_RADIO_MAESTRO                         := m
-CONFIG_DVB_S5H1420                           := m
-CONFIG_RADIO_MIROPCM20                       := m
-CONFIG_I2C                                   := m
-CONFIG_DVB_NXT200X                           := m
-CONFIG_DVB_TDA10021                          := m
-CONFIG_DVB_CORE                              := m
-CONFIG_VIDEO_PVRUSB2_SYSFS                   := y
-CONFIG_VIDEO_CX88_DVB_LGDT330X               := n
-CONFIG_VIDEO_UPD64083                        := m
-CONFIG_USB_DABUSB                            := m
-CONFIG_DVB_DIB3000MC                         := m
-CONFIG_DVB_PLUTO2                            := m
-CONFIG_RADIO_GEMTEK_PCI                      := m
-CONFIG_DVB_TDA1004X                          := m
-CONFIG_VIDEO_SAA711X                         := m
-CONFIG_DVB_BT8XX                             := m
-CONFIG_VIDEO_CQCAM                           := m
-CONFIG_VIDEO_CX88_DVB_OR51132                := n
-CONFIG_TUNER_3036                            := m
-CONFIG_USB_SE401                             := m
-CONFIG_DVB_L64781                            := m
-CONFIG_VIDEO_BUF_DVB                         := m
-CONFIG_DVB_USB_DTT200U                       := m
-CONFIG_DVB_CINERGYT2_QUERY_INTERVAL          := 250
-CONFIG_RADIO_TRUST                           := m
-CONFIG_VIDEO_HEXIUM_ORION                    := m
-CONFIG_VIDEO_CX88_DVB_CX22702                := n
-CONFIG_VIDEO_CX88_ALSA                       := m
-CONFIG_DVB_SP887X                            := m
-CONFIG_DVB_STV0297                           := m
-CONFIG_DVB_CX22700                           := m
-CONFIG_VIDEO_SAA7134                         := m
-CONFIG_VIDEO_WM8739                          := m
-CONFIG_VIDEO_VIDEOBUF                        := m
-CONFIG_DVB_MT352                             := m
-CONFIG_INET                                  := m
-CONFIG_USB_STV680                            := m
-CONFIG_SOUND_ACI_MIXER                       := m
-CONFIG_VIDEO_MSP3400                         := m
-CONFIG_VIDEO_SAA5249                         := m
-CONFIG_VIDEO_STRADIS                         := m
-CONFIG_VIDEO_ZORAN_DC10                      := m
-CONFIG_DVB_MT312                             := m
-CONFIG_VIDEO_PLANB                           := n
-CONFIG_VIDEO_TUNER                           := m
-CONFIG_VIDEO_ADV_DEBUG                       := y
-CONFIG_VIDEO_ZORAN_LML33R10                  := m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG                := y
-CONFIG_USB                                   := m
-CONFIG_VIDEO_PMS                             := m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY              := y
-CONFIG_DVB_CX22702                           := m
-CONFIG_VIDEO_MEYE                            := m
-CONFIG_VIDEO_HEXIUM_GEMINI                   := m
-CONFIG_FW_LOADER                             := m
-CONFIG_RADIO_MAXIRADIO                       := m
-CONFIG_PROC_FS                               := m
-CONFIG_RADIO_AZTECH                          := m
-CONFIG_PCI                                   := m
-CONFIG_RADIO_RTRACK2_PORT                    := n
-CONFIG_DVB_OR51211                           := m
-CONFIG_DVB_NXT6000                           := m
-CONFIG_DVB_USB_NOVA_T_USB2                   := m
-CONFIG_DVB_USB_VP702X                        := m
-CONFIG_VIDEO_SAA7127                         := m
-CONFIG_DVB_ZL10353                           := m
-CONFIG_VIDEO_SAA7134_ALSA                    := m
-CONFIG_RADIO_AZTECH_PORT                     := n
-CONFIG_DVB_B2C2_FLEXCOP_USB                  := m
-CONFIG_DVB_BUDGET_PATCH                      := m
-CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE  := y
-CONFIG_DVB_BUDGET                            := m
-CONFIG_VIDEO_CX88_DVB_CX24123                := n
-CONFIG_SGI_IP22                              := m
-CONFIG_RADIO_TYPHOON_PORT                    := n
-CONFIG_DVB_VES1820                           := m
-CONFIG_VIDEO_CX88_DVB                        := m
-CONFIG_DVB_BCM3510                           := m
-CONFIG_ISA                                   := m
-CONFIG_VIDEO_CS53L32A                        := m
-CONFIG_DVB_TDA8083                           := m
-CONFIG_VIDEO_ZORAN_LML33                     := m
-CONFIG_USB_DSBR                              := m
-CONFIG_VIDEO_SAA7134_DVB                     := m
-CONFIG_VIDEO_CX88_DVB_MT352                  := n
-CONFIG_SND_PCM                               := m
-CONFIG_DVB_B2C2_FLEXCOP                      := m
-CONFIG_RADIO_CADET                           := m
-CONFIG_SOUND_PRIME                           := m
-CONFIG_VIDEO_W9966                           := m
-CONFIG_USB_W9968CF                           := m
-CONFIG_VIDEO_IR                              := m
-CONFIG_VIDEO_M32R_AR                         := m
-CONFIG_DVB_USB_DEBUG                         := y
-CONFIG_DVB_CX24110                           := m
-CONFIG_DVB_BUDGET_CI                         := m
-CONFIG_SYSFS                                 := m
-CONFIG_DVB_STV0299                           := m
-CONFIG_VIDEO_CPIA2                           := m
-CONFIG_DVB_CINERGYT2_TUNING                  := y
-CONFIG_VIDEO_OVCAMCHIP                       := m
-CONFIG_RADIO_GEMTEK                          := m
-CONFIG_RADIO_SF16FMI                         := m
-CONFIG_RADIO_RTRACK_PORT                     := n
-CONFIG_DVB_BUDGET_AV                         := m
-CONFIG_MODULES                               := y
-CONFIG_PPC_PMAC                              := m
-CONFIG_PARPORT                               := m
-CONFIG_DVB_AV7110                            := m
-CONFIG_BROKEN                                := m
-CONFIG_DVB_B2C2_FLEXCOP_PCI                  := m
-CONFIG_M32R                                  := m
-CONFIG_NET                                   := m
-CONFIG_RADIO_SF16FMR2                        := m
-CONFIG_DVB_USB                               := m
-CONFIG_CRC32                                 := m
-CONFIG_VIDEO_VINO                            := n
-CONFIG_RADIO_TRUST_PORT                      := n
-CONFIG_DVB_OR51132                           := m
-CONFIG_DVB_USB_UMT_010                       := m
-CONFIG_VIDEO_TVEEPROM                        := m
-CONFIG_RADIO_TERRATEC                        := m
-CONFIG_RADIO_ZOLTRIX                         := m
-CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT        := 32
-CONFIG_RADIO_MIROPCM20_RDS                   := m
-CONFIG_VIDEO_ZORAN                           := m
-CONFIG_RADIO_TYPHOON_MUTEFREQ                := n
-CONFIG_VIDEO_CX88                            := m
-CONFIG_RADIO_RTRACK2                         := m
-CONFIG_SONYPI                                := m
-CONFIG_DVB_USB_DIBUSB_MC                     := m
-CONFIG_RADIO_TYPHOON_PROC_FS                 := y
-CONFIG_RADIO_GEMTEK_PORT                     := n
-CONFIG_DVB_DIB3000MB                         := m
-CONFIG_DVB_USB_VP7045                        := m
-CONFIG_DVB_USB_CXUSB                         := m
-CONFIG_VIDEO_BTCX                            := m
-CONFIG_VIDEO_ZR36120                         := n
-CONFIG_VIDEO_CPIA_PP                         := m
-CONFIG_DVB_USB_A800                          := m
-CONFIG_DVB                                   := y
-CONFIG_VIDEO_CPIA                            := m
-CONFIG_PARPORT_1284                          := m
-CONFIG_DVB_USB_DIBUSB_MB                     := m
-CONFIG_VIDEO_BUF                             := m
-CONFIG_VIDEO_BT848_DVB                       := y
-CONFIG_VIDEO_CX88_DVB_ZL10353                := n
-CONFIG_VIDEO_SAA6588                         := m
-CONFIG_DVB_CX24123                           := m
-CONFIG_RADIO_TYPHOON                         := m
-CONFIG_VIDEO_DEV                             := y
-CONFIG_I2C_ALGO_SGI                          := m
-CONFIG_DVB_VES1X93                           := m
-CONFIG_RADIO_TERRATEC_PORT                   := n
-CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS       := y
-CONFIG_VIDEO_SAA7134_DVB_TDA1004X            := n
-CONFIG_VIDEO_SAA7134_OSS                     := m
-CONFIG_EXPERIMENTAL                          := m
-CONFIG_VIDEO_UPD64031A                       := m
-CONFIG_DVB_LGDT330X                          := m
-CONFIG_VIDEO_ZORAN_BUZ                       := m
-CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL       := 50
-CONFIG_DVB_AV7110_OSD                        := y
-CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS          := y
-CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE         := 512
-CONFIG_VIDEO_M32R_AR_M64278                  := n
-CONFIG_VIDEO_ZORAN_DC30                      := m
-CONFIG_VIDEO_PVRUSB2_DEBUGIFC                := y
-CONFIG_VIDEO_MXB                             := m
-CONFIG_VIDEO_SAA5246A                        := m
-CONFIG_PLAT_M32700UT                         := m
-CONFIG_VIDEO_CX25840                         := m
-CONFIG_VIDEO_PVRUSB2                         := m
-CONFIG_RADIO_RTRACK                          := m
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 17ef048e7..116df3394 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -153,3 +153,11 @@ while ( my ($key, $value) = each(%depend) ) {
 	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
 }
 close OUT;
+
+if (open OUT,".myconfig") {
+	close IN;
+} else {
+	system "make allmodconfig";
+}
+
+
-- 
cgit v1.2.3


From a07c19452320fc979168680cb0fa02f1134668b7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 18:20:18 -0300
Subject: Added make menuconfig

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index f9c6fe516..2e20d2d03 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -200,6 +200,12 @@ config:: links .version
 	$(KDIR)/scripts/kconfig/conf Kconfig
 	./scripts/make_noconfig.pl
 
+menuconfig:: links .version
+	./scripts/make_kconfig.pl
+	-ln -s /usr/src/linux-2.6.16/scripts/kconfig scripts/
+	$(KDIR)/scripts/kconfig/mconf Kconfig
+	./scripts/make_noconfig.pl
+
 allmodconfig:: links .version
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/conf -m Kconfig
-- 
cgit v1.2.3


From e27be77e53c76ea18b468ed9c3eab9460c23e53e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 18:31:23 -0300
Subject: Added some missing extraflags

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Some drivers were missing some options. Fixed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 2e20d2d03..8e4170277 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -21,14 +21,45 @@ default:: Makefile.media links .version
 EXTRA_CFLAGS += -DDVB_CVS=1
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
+
+ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1
+endif
+
+ifeq ($(CONFIG_XC3028),m)
+ EXTRA_CFLAGS += -DCONFIG_XC3028=1
+endif
+
 ifeq ($(CONFIG_DVB_FIRESAT),m)
   EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
 endif
 
+ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
+ EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
+ EXTRA_CFLAGS += -DHAVE_CX22702=1
+ EXTRA_CFLAGS += -DHAVE_OR51132=1
+ EXTRA_CFLAGS += -DHAVE_LGDT330X=1
+ EXTRA_CFLAGS += -DHAVE_MT352=1
+ EXTRA_CFLAGS += -DHAVE_ZL10353=1
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
+ EXTRA_CFLAGS += -DHAVE_CX24123=1
+ EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1
+endif
+
+ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
+ EXTRA_CFLAGS += -DHAVE_MT352=1
+ EXTRA_CFLAGS += -DHAVE_TDA1004X=1
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
+endif
+
 ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
  EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
 endif
 
+ifeq ($(CONFIG_DVB_AV7110_OSD),y)
+ EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1
+endif
+
 ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
   EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
-- 
cgit v1.2.3


From 6f35eb920300b903a0078d2ca191d1ea9cd7a15f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 19:05:36 -0300
Subject: Newer drivers now compile fine with 2.6.14 kernel.

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_noconfig.pl | 3 +++
 v4l/versions.txt             | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
index 503653a4f..a47ca4acf 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_noconfig.pl
@@ -55,6 +55,9 @@ close IN;
 
 open OUT,">.myconfig";
 while ( my ($key, $value) = each(%config) ) {
+	if ($value eq "y") {
+		$value="m";
+	}
 	printf OUT "%-44s := %s\n",$key,$value;
 }
 close OUT;
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 60d4bdbad..c6c0ecd3b 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -3,12 +3,14 @@
 # This is broken for a long time
 VIDEO_ZR36120
 
-# Those are architecture-dependent
+# This is also marked as broken
 VIDEO_PLANB
+
+# Those are architecture-dependent
 VIDEO_VINO
 VIDEO_M32R_AR_M64278
 
-[2.6.16]
+[2.6.14]
 VIDEO_ZORAN
 VIDEO_ZORAN_BUZ
 VIDEO_ZORAN_DC10
-- 
cgit v1.2.3


From ce9bb40d3a071e34fea5557e89ff94960a0f03ab Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 20:28:55 -0300
Subject: Make menuconfig is now more generic

From: Mauro Carvalho Chehab <mchehab@infradead.org>

It works fine with kernels 2.6.16 and 2.6.14.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 8e4170277..f80c2aec1 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -233,7 +233,15 @@ config:: links .version
 
 menuconfig:: links .version
 	./scripts/make_kconfig.pl
-	-ln -s /usr/src/linux-2.6.16/scripts/kconfig scripts/
+	-rm scripts/lxdialog scripts/kconfig
+	-if [ -d $(KDIR)/scripts/lxdialog ]; then \
+		ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \
+	fi
+
+	-if [ -d $(KDIR)/scripts/kconfig ]; then \
+		ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \
+	fi
+
 	$(KDIR)/scripts/kconfig/mconf Kconfig
 	./scripts/make_noconfig.pl
 
-- 
cgit v1.2.3


From 1226dd8de3d9e43febad2e10f8bd96d66ad764a6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 9 Apr 2006 20:33:55 -0300
Subject: From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, "make clean" only removes the intermediate files and keeps
the .config avoiding need to reconfigure all stuff.

To cleanup all config, "make distclean" is provided.

Thanks-to: C.Y.M <syphir@syphir.sytes.net>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index f80c2aec1..ad1f1ac23 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -189,11 +189,11 @@ clean::
 	@find . -name '*.c' -type l -exec rm '{}' \;
 	@find . -name '*.h' -type l -exec rm '{}' \;
 	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
-		ivtv-svnversion.h \
-		Kconfig Kconfig.kern .config .config.cmd
+		ivtv-svnversion.h 
 
 distclean:: clean
-	-rm -f .version .*.o.flags .*.o.d Makefile.media
+	-rm -f .version .*.o.flags .*.o.d Makefile.media \
+		Kconfig Kconfig.kern .config .config.cmd
 	-rm -rf .tmp_versions
 	@find .. -name '*.orig' -exec rm '{}' \;
 	@find .. -name '*.rej' -exec rm '{}' \;
-- 
cgit v1.2.3


From 24bda047c0558518cdd4845894af9a62fe0cfe36 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 11 Apr 2006 17:55:53 -0300
Subject: Merge: from V4L1 tree

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/versions.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index c6c0ecd3b..255a31b17 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -10,6 +10,16 @@ VIDEO_PLANB
 VIDEO_VINO
 VIDEO_M32R_AR_M64278
 
+[2.6.16]
+VIDEO_USBVIDEO
+USB_VICAM
+USB_IBMCAM
+USB_KONICAWC
+USB_ET61X251
+USB_PWC
+USB_SN9C102
+USB_ZC0301
+
 [2.6.14]
 VIDEO_ZORAN
 VIDEO_ZORAN_BUZ
@@ -66,7 +76,11 @@ RADIO_ZOLTRIX
 RADIO_ZOLTRIX_PORT
 
 [2.6.12]
+VIDEO_VIVI
 VIDEO_DEV
+VIDEO_V4L1
+VIDEO_V4L2
+VIDEO_V4L1_COMPAT
 VIDEO_ADV_DEBUG
 VIDEO_BT848
 VIDEO_BT848_DVB
-- 
cgit v1.2.3


From 910221dc42da61230663602c4dc35b38e3f15270 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 12 Apr 2006 01:06:33 -0400
Subject: fix ivtv virtual merge build and install

From: Michael Krufky <mkrufky@linuxtv.org>

The merged ivtv build functionality was lost in the new build configuration.
This patch restores the build and install functionality for both ivtv and
cx88-ivtv.

make ivtv	enable merged ivtv build
make cx88-ivtv	enable cx88-ivtv emulation mode for cx88-blackbird
make ivtv-up	update ivtv sources using subversion
make ivtv-install	install modules
make ivtv-rminstall	remove modules

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile      |  1 +
 v4l/Makefile.ivtv | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 v4l/Makefile.ivtv

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index ad1f1ac23..e932eeb65 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -13,6 +13,7 @@ default:: Makefile.media links .version
 
 -include $(obj)/.myconfig
 -include $(obj)/Makefile.media
+-include $(obj)/Makefile.ivtv
 
 #################################################
 # CFLAGS configuration
diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv
new file mode 100644
index 000000000..12f395e39
--- /dev/null
+++ b/v4l/Makefile.ivtv
@@ -0,0 +1,26 @@
+#
+# ivtv build rules
+#
+CONFIG_VIDEO_IVTV	:= $(if $(wildcard $(src)/ivtv-svnversion.h),m)
+CONFIG_VIDEO_CX88_IVTV	:= $(if $(wildcard $(src)/cx88-ivtv.c),m)
+
+ivtv-objs	:=	ivtv-driver.o ivtv-fileops.o ivtv-i2c.o \
+			ivtv-streams.o ivtv-firmware.o ivtv-reset.o \
+			ivtv-gpio.o ivtv-queue.o ivtv-irq.o ivtv-mailbox.o \
+			ivtv-vbi.o ivtv-kthreads.o ivtv-audio.o ivtv-ioctl.o \
+			ivtv-controls.o ivtv-video.o ivtv-cards.o ivtv-yuv.o
+ivtv-fb-objs	:=	ivtv-osd.o ivtv-queue.o
+
+obj-$(CONFIG_VIDEO_IVTV) += ivtv.o ivtv-fb.o
+obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o
+
+ivtv-install::
+	@echo -e "\nInstalling $(KDIR26)/video/ivtv files:"
+	@install -d $(KDIR26)/video/ivtv
+	@files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; install -m 644 -c $$i $(KDIR26)/video/ivtv; fi; done; echo;
+	/sbin/depmod -a ${KERNELRELEASE}
+
+ivtv-rminstall::
+	@echo -e "\nRemoving old $(DEST) files\n"
+	@echo -e "\nRemoving old $(KDIR26)/video/ivtv files:"
+	@files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i ]; then echo -n "$$i "; rm $(KDIR26)/video/ivtv/$$i; fi; done; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i.gz ]; then echo -n "$$i.gz "; rm $(KDIR26)/video/ivtv/$$i.gz; fi; done; echo;
-- 
cgit v1.2.3


From 3d4f1593ec1d456170e6daedb6ae8cab00501bd9 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 12 Apr 2006 17:04:45 -0400
Subject: 'make ivtv-rminstall' - remove bad console output

From: Michael Krufky <mkrufky@linuxtv.org>

I accidentally copied too many lines from Makefile.media into Makefile.ivtv

This changeset removes the following lines:
	@echo -e "\nRemoving old $(DEST) files\n"

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile.ivtv | 1 -
 1 file changed, 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv
index 12f395e39..69962f9e4 100644
--- a/v4l/Makefile.ivtv
+++ b/v4l/Makefile.ivtv
@@ -21,6 +21,5 @@ ivtv-install::
 	/sbin/depmod -a ${KERNELRELEASE}
 
 ivtv-rminstall::
-	@echo -e "\nRemoving old $(DEST) files\n"
 	@echo -e "\nRemoving old $(KDIR26)/video/ivtv files:"
 	@files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i ]; then echo -n "$$i "; rm $(KDIR26)/video/ivtv/$$i; fi; done; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i.gz ]; then echo -n "$$i.gz "; rm $(KDIR26)/video/ivtv/$$i.gz; fi; done; echo;
-- 
cgit v1.2.3


From 91263e7de241ee6403c43cd3a13206f749798ba6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 13 Apr 2006 18:50:22 -0300
Subject: Added missing depmod after the end of installation process

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_makefile.pl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 116df3394..8371f6a4a 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -124,6 +124,7 @@ while ( my ($key, $value) = each(%instdir) ) {
 	printf OUT "for i in \$\$files;do if [ -e \$\$i ]; then echo -n \"\$\$i \";";
 	printf OUT " install -m 644 -c \$\$i \$(KDIR26)/$key; fi; done; echo;\n\n";
 }
+printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n";
 
 # Creating Remove rule
 printf OUT "remove rminstall::\n";
-- 
cgit v1.2.3


From 7fcf69dab28d0e73c9c2bb5744b884001faddb09 Mon Sep 17 00:00:00 2001
From: Oliver Endriss <o.endriss@gmx.de>
Date: Sat, 15 Apr 2006 16:26:44 +0200
Subject: make_noconfig.pl fixed for CONFIG_DVB_AV7110_OSD and
 CONFIG_DVB_AV7110_FIRMWARE

From: Oliver Endriss <o.endriss@gmx.de>

Without this fix, CONFIG_DVB_AV7110_OSD=y and CONFIG_DVB_AV7110_FIRMWARE=y
were ignored in v4l/Makefile because make_noconfig.pl set them to
"CONFIG_DVB_AV7110_... = m".

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
---
 v4l/scripts/make_noconfig.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
index a47ca4acf..94f80a954 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_noconfig.pl
@@ -55,7 +55,9 @@ close IN;
 
 open OUT,">.myconfig";
 while ( my ($key, $value) = each(%config) ) {
-	if ($value eq "y") {
+	if ($key ne CONFIG_DVB_AV7110_OSD &&
+	    $key ne CONFIG_DVB_AV7110_FIRMWARE &&
+	    $value eq "y") {
 		$value="m";
 	}
 	printf OUT "%-44s := %s\n",$key,$value;
-- 
cgit v1.2.3


From c9eef42f5449ab1894a458988661f433624ccb81 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 22 Apr 2006 09:42:38 -0300
Subject: Adds capability to build conf/mconf/qconf/lxdialog at kernel tree

From: Mauro Carvalho Chehab <mchehab@infradead.org>

This patch adds v4l makefile capabilities to build kernel config required
files to allow make menuconfig/xconfig/gconfig to work. After this patch,
menu support is more smooth.
Of course, root privileges are required to build those stuff.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index e932eeb65..c74019f45 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -217,17 +217,27 @@ reload::
 #################################################
 # Configuration rules
 
+# SHELL used by kbuild
+CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+          else if [ -x /bin/bash ]; then echo /bin/bash; \
+          else echo sh; fi ; fi)
+
+build := srctree=$(KDIR) HOSTCXX=$(CXX) HOSTCC=$(CC) CONFIG_SHELL=$(CONFIG_SHELL) -f $(KDIR)/scripts/Makefile.build obj
+
 xconfig:: links .version
+	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig qconf-target=1 scripts/kconfig/qconf
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/qconf Kconfig
 	./scripts/make_noconfig.pl
 
 gconfig:: links .version
+	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/gconf
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/gconf Kconfig
 	./scripts/make_noconfig.pl
 
 config:: links .version
+	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/conf Kconfig
 	./scripts/make_noconfig.pl
@@ -236,17 +246,24 @@ menuconfig:: links .version
 	./scripts/make_kconfig.pl
 	-rm scripts/lxdialog scripts/kconfig
 	-if [ -d $(KDIR)/scripts/lxdialog ]; then \
+		$(MAKE) -C $(KDIR) $(build)=scripts/lxdialog; \
 		ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \
 	fi
 
 	-if [ -d $(KDIR)/scripts/kconfig ]; then \
+		if [  -d $(KDIR)/scripts/kconfig/lxdialog ]; then \
+			$(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \
+		else \
+			$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \
+		fi; \
 		ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \
 	fi
 
 	$(KDIR)/scripts/kconfig/mconf Kconfig
 	./scripts/make_noconfig.pl
 
-allmodconfig:: links .version
+allyesconfig allmodconfig:: links .version
+	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/conf -m Kconfig
 	cat .config|grep -v CONFIG_DVB_AV7110_FIRMWARE >.config.new
-- 
cgit v1.2.3


From 6f290f63b3a7cd010a4bedcd36932b18617b34bb Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 24 Apr 2006 10:29:46 -0300
Subject: [PATCH] update pwc driver

From: Luc Saillard <luc@saillard.org>

Add v4l2 compatibility
Include the decompressor (legal problem has been resolv by Alan Cox)
Faster decoder and easier to maintain, optimize, ...
Can export to userland compressed stream
Support more cameras, lot of bugs are fixed.

Signed-off-by: Luc Saillard <luc@saillard.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/versions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index 255a31b17..07b983037 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -17,6 +17,7 @@ USB_IBMCAM
 USB_KONICAWC
 USB_ET61X251
 USB_PWC
+USB_PWC_DEBUG
 USB_SN9C102
 USB_ZC0301
 
-- 
cgit v1.2.3


From 00ae040d86fe4250f09667bacd62bad2bd970090 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 24 Apr 2006 11:09:17 -0300
Subject: Fix compilation for sn9c102 on older kernels

From: reinhard schwab <reinhard.schwab@aon.at>

Signed-off-by: Reinhard Schwab <reinhard.schwab@aon.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/versions.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index 07b983037..1d4209680 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -18,7 +18,6 @@ USB_KONICAWC
 USB_ET61X251
 USB_PWC
 USB_PWC_DEBUG
-USB_SN9C102
 USB_ZC0301
 
 [2.6.14]
@@ -76,6 +75,9 @@ RADIO_TYPHOON_MUTEFREQ
 RADIO_ZOLTRIX
 RADIO_ZOLTRIX_PORT
 
+[2.6.13]
+USB_SN9C102
+
 [2.6.12]
 VIDEO_VIVI
 VIDEO_DEV
-- 
cgit v1.2.3


From c0321d8d13c5ba11219c7db09f0ad3e3baf194f3 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 25 Apr 2006 10:55:03 -0400
Subject: remove forced dvb frontend module dependencies left around from old
 build method

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile | 27 ---------------------------
 v4l/compat.h | 13 -------------
 2 files changed, 40 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index c74019f45..864ae6732 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -18,11 +18,6 @@ default:: Makefile.media links .version
 #################################################
 # CFLAGS configuration
 
-# for DVB
-EXTRA_CFLAGS += -DDVB_CVS=1
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
-
 ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
  EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1
 endif
@@ -35,28 +30,6 @@ ifeq ($(CONFIG_DVB_FIRESAT),m)
   EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
 endif
 
-ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
- EXTRA_CFLAGS += -DHAVE_CX22702=1
- EXTRA_CFLAGS += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_LGDT330X=1
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_ZL10353=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
- EXTRA_CFLAGS += -DHAVE_CX24123=1
- EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1
-endif
-
-ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_TDA1004X=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
-endif
-
-ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
- EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
-endif
-
 ifeq ($(CONFIG_DVB_AV7110_OSD),y)
  EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1
 endif
diff --git a/v4l/compat.h b/v4l/compat.h
index 9efcfebd1..0bcb238fb 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -131,19 +131,6 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
 }
 #endif
 
-#ifndef DVB_CVS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_LGDT330X
-#undef HAVE_TDA1004X
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-#undef HAVE_NXT200X
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#undef HAVE_CX24123
-#endif
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 /* some keys from 2.6.x which are not (yet?) in 2.4.x */
 # define KEY_PLAY                207
-- 
cgit v1.2.3


From b3517807572461268b800009d1148d4e81e79ad9 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 25 Apr 2006 11:23:00 -0400
Subject: remove redundant EXTRA_CFLAGS from local Makefile for pvrusb2

From: Michael Krufky <mkrufky@linuxtv.org>

The EXTRA_CFLAGS complile-time options for pvrusb2 are determined by kbuild,
and are set in drivers/media/video/pvrusb2/[Makefile|Kconfig].  Setting
these flags in the local Makefile is redundant.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 864ae6732..a96571f1c 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -38,17 +38,6 @@ ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
   EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
 
-# for pvrusb2
-ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
-endif
-
 EXTRA_CFLAGS += -g
 
 EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
-- 
cgit v1.2.3


From ad0f358703b8e45db5d9645b69503d2b99ae1e50 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 25 Apr 2006 11:32:05 -0400
Subject: remove redundant EXTRA_CFLAGS setting in Makefile for
 CONFIG_VIDEO_ADV_DEBUG

From: Michael Krufky <mkrufky@linuxtv.org>

The EXTRA_CFLAGS complile-time options are determined by kbuild.
CONFIG_VIDEO_ADV_DEBUG is set in drivers/media/video/[Makefile|Kconfig].
Setting this flag in the local Makefile is redundant.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index a96571f1c..4c11902b5 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -18,10 +18,6 @@ default:: Makefile.media links .version
 #################################################
 # CFLAGS configuration
 
-ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1
-endif
-
 ifeq ($(CONFIG_XC3028),m)
  EXTRA_CFLAGS += -DCONFIG_XC3028=1
 endif
-- 
cgit v1.2.3


From 6a6a2d0070d94c04bdb2961a143fd516753464f0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 25 Apr 2006 18:20:44 -0300
Subject: Improves V4L/DVB in-tree building

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, make_kconfig.sh will check for boolean/tristate config
vars and handle it properly.
Also, make allyesconfig/allmodconfig will use make_kconfig.sh
to generate .myconfig instead of conf -m. This way, make all will
not require priviledges at kernel tree.
write access to kernel tree is still required for make menuconfig/
make xconfig/make qconfig.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile                 |  6 +-----
 v4l/scripts/make_kconfig.pl  | 46 ++++++++++++++++++++++++++++++++++++++++++--
 v4l/scripts/make_noconfig.pl |  5 -----
 3 files changed, 45 insertions(+), 12 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index c74019f45..9acafb007 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -263,11 +263,7 @@ menuconfig:: links .version
 	./scripts/make_noconfig.pl
 
 allyesconfig allmodconfig:: links .version
-	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf
-	./scripts/make_kconfig.pl
-	$(KDIR)/scripts/kconfig/conf -m Kconfig
-	cat .config|grep -v CONFIG_DVB_AV7110_FIRMWARE >.config.new
-	mv .config.new .config
+	./scripts/make_kconfig.pl 1
 	./scripts/make_noconfig.pl
 
 #################################################
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index b1d6f5d53..11392c32d 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -4,8 +4,27 @@ use FileHandle;
 my %depend = ();
 my %minver = ();
 my %config = ();
+my %tristate = ();
 my $version, $level, $sublevel;
 
+my $force_kconfig=shift;
+
+sub add_bool($)
+{
+	my $arg=shift;
+
+	$tristate{$arg}="bool";
+	printf "Boolean:%s\n",$arg;
+}
+
+sub add_tristate($)
+{
+	my $arg=shift;
+
+	$tristate{$arg}="tristate";
+	printf "Tristate:%s\n",$arg;
+}
+
 sub add_config($)
 {
 	my $arg=shift;
@@ -34,6 +53,7 @@ sub open_kconfig($$) {
 	my ($dir,$file)=@_;
 	my $in = new FileHandle;
 	my $skip=0;
+	my $key;
 
 #print "opening $file\n";
 	open $in,"$file";
@@ -51,9 +71,14 @@ sub open_kconfig($$) {
 		if (m|^\s+select (.*)\n|) {
 			check_deps ($1);
 		}
+		if (m|^\s*bool\s+|) {
+			add_bool($key);
+		}
+		if (m|^\s*tristate\s+|) {
+			add_tristate($key);
+		}
 		if (m|^\s*config (.*)\n|) {
-			my $key=$1;
-
+			$key=$1;
 			add_config ($1);
 
 			my $min=$minver { $key };
@@ -139,9 +164,26 @@ while ( my ($key, $value) = each(%config) ) {
 open OUT,">Kconfig.kern";
 
 print OUT "config MODULES\n\tboolean\n\tdefault y\n\n";
+$tristate{"MODULES"}="bool";
 
 while ( my ($key, $value) = each(%depend) ) {
 	print OUT "# $key with $value refs\nconfig $key\n\ttristate\n\tdefault m\n\n";
 }
 close OUT;
 
+if (($force_kconfig eq 1) || !open IN,".config") {
+	open OUT,">.config";
+	while ( my ($key,$value) = each(%tristate) ) {
+
+		if ($key eq "DVB_AV7110_FIRMWARE") {
+				printf OUT "CONFIG_%s=n\n",$key;
+		} else {
+			if ($value eq "tristate") {
+				printf OUT "CONFIG_%s=m\n",$key;
+			} else {
+				printf OUT "CONFIG_%s=y\n",$key;
+			}
+		}
+	}
+	close OUT;
+}
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
index 94f80a954..503653a4f 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_noconfig.pl
@@ -55,11 +55,6 @@ close IN;
 
 open OUT,">.myconfig";
 while ( my ($key, $value) = each(%config) ) {
-	if ($key ne CONFIG_DVB_AV7110_OSD &&
-	    $key ne CONFIG_DVB_AV7110_FIRMWARE &&
-	    $value eq "y") {
-		$value="m";
-	}
 	printf OUT "%-44s := %s\n",$key,$value;
 }
 close OUT;
-- 
cgit v1.2.3


From ecf096774ea92402d1ebea9d8fac8ac12316d766 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 10:13:07 -0300
Subject: Added some tests at build system to avoid rebuilding kernel stuff

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, make will first check for the presense of *conf and lxconfig.
if already found at kernel tree, it will use without recompiling.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index dc7836557..3afe20e8b 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -76,6 +76,7 @@ KDIRUSB		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
 #################################################
 # Compiler fixup rules
 
+HOSTCC:=$(CC)
 CC += -I$(obj)
 
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -180,22 +181,28 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
           else if [ -x /bin/bash ]; then echo /bin/bash; \
           else echo sh; fi ; fi)
 
-build := srctree=$(KDIR) HOSTCXX=$(CXX) HOSTCC=$(CC) CONFIG_SHELL=$(CONFIG_SHELL) -f $(KDIR)/scripts/Makefile.build obj
+build := srctree=$(KDIR) HOSTCXX="$(CXX)" HOSTCC="$(HOSTCC)" CONFIG_SHELL="$(CONFIG_SHELL)" -f $(KDIR)/scripts/Makefile.build obj
 
 xconfig:: links .version
-	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig qconf-target=1 scripts/kconfig/qconf
+	-if [ ! -f $(KDIR)/scripts/kconfig/qconf ]; then \
+		$(MAKE) -C $(KDIR) $(build)=scripts/kconfig qconf-target=1 scripts/kconfig/qconf; \
+	fi
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/qconf Kconfig
 	./scripts/make_noconfig.pl
 
 gconfig:: links .version
-	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/gconf
+	-if [ ! -f $(KDIR)/scripts/kconfig/gconf ]; then \
+		$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/gconf; \
+	fi
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/gconf Kconfig
 	./scripts/make_noconfig.pl
 
 config:: links .version
-	$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf
+	-if [ ! -f $(KDIR)/scripts/kconfig/conf ]; then \
+		$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf; \
+	fi
 	./scripts/make_kconfig.pl
 	$(KDIR)/scripts/kconfig/conf Kconfig
 	./scripts/make_noconfig.pl
@@ -204,15 +211,21 @@ menuconfig:: links .version
 	./scripts/make_kconfig.pl
 	-rm scripts/lxdialog scripts/kconfig
 	-if [ -d $(KDIR)/scripts/lxdialog ]; then \
-		$(MAKE) -C $(KDIR) $(build)=scripts/lxdialog; \
+		if [ ! -f $(KDIR)/scripts/lxdialog/lxdialog ]; then \
+			$(MAKE) -C $(KDIR) $(build)=scripts/lxdialog; \
+		fi; \
 		ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \
 	fi
 
 	-if [ -d $(KDIR)/scripts/kconfig ]; then \
 		if [  -d $(KDIR)/scripts/kconfig/lxdialog ]; then \
-			$(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \
+			if [ ! -f $(KDIR)/scripts/kconfig/lxdialog ]; then \
+				$(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \
+			fi; \
 		else \
-			$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \
+			if [ ! -f $(KDIR)/scripts/kconfig/mconf ]; then \
+				$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \
+			fi; \
 		fi; \
 		ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \
 	fi
-- 
cgit v1.2.3


From e1526ffa31150849a329a3974cceb151193a1364 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 15:35:10 -0300
Subject: Some improvements at Makefile

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Included a INSTALL file
make help shows the INSTALL file
added make release to force compiling against a specified version

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 3afe20e8b..bf4aa56f2 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -120,12 +120,21 @@ all:: allmodconfig default
 Makefile.media::
 	scripts/make_makefile.pl
 
-.version:
+.version::
 ifneq ($(KERNELRELEASE),)
-	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
 else
-	echo "No version yet."
-	uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	@echo "No version yet."
+	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+endif
+
+release::
+ifneq ($(VER),)
+	@echo "Forcing compiling to version $(VER)."
+	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+else
+	@echo "No version specified. Using `uname -r`."
+	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
 links::
@@ -139,7 +148,7 @@ kernel-links makelinks::
 #################################################
 # Cardlist updating rule
 
-card cardlist cardlists:
+card cardlist cardlists::
 	scripts/cardlist
 
 #################################################
@@ -281,9 +290,6 @@ old-install:: rminstall
 #################################################
 # Tree management rules
 
-change changes changelog::
-	make -C .. changelog
-
 update::
 	make -C .. update
 
@@ -293,6 +299,11 @@ commit cvscommit hgcommit::
 push::
 	make -C .. push
 
+#################################################
+# Help
+help::
+	@cat ../INSTALL
+
 #################################################
 # build tarballs rules
 
@@ -305,7 +316,7 @@ tardest	?= .
 snapdir := $(HOME)/snapshot
 snap	:= $(name)
 
-snapshot snap tarball: update distclean
+snapshot snap tarball:: update distclean
 	echo $(thisdir)
 	echo $(name)
 	echo $(date) > .snapshot
-- 
cgit v1.2.3


From 6c57a552152a8a96e51cf0d327d482e774f10eb7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 15:45:52 -0300
Subject: Cleaned an obsoleted rule

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index bf4aa56f2..289183f56 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -122,19 +122,19 @@ Makefile.media::
 
 .version::
 ifneq ($(KERNELRELEASE),)
-	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
 else
-	@echo "No version yet."
-	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	echo "No version yet."
+	uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
 release::
 ifneq ($(VER),)
-	@echo "Forcing compiling to version $(VER)."
-	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	echo "Forcing compiling to version $(VER)."
+	-echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 else
-	@echo "No version specified. Using `uname -r`."
-	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	echo "No version specified. Using `uname -r`."
+	-uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
 links::
@@ -170,9 +170,6 @@ distclean:: clean
 #################################################
 # Kernel module insert/removal rules
 
-rmmodules::
-	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
-
 insmod load::
 	scripts/insmod.sh load
 
@@ -299,11 +296,6 @@ commit cvscommit hgcommit::
 push::
 	make -C .. push
 
-#################################################
-# Help
-help::
-	@cat ../INSTALL
-
 #################################################
 # build tarballs rules
 
-- 
cgit v1.2.3


From 0ec86f485a5553976721525a52d4b85642e6de1c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 18:00:35 -0300
Subject: The latest patch partially reverted some changes. fixing it.

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 289183f56..7814c6799 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -122,19 +122,19 @@ Makefile.media::
 
 .version::
 ifneq ($(KERNELRELEASE),)
-	echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
 else
-	echo "No version yet."
-	uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	@echo "No version yet."
+	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
 release::
 ifneq ($(VER),)
-	echo "Forcing compiling to version $(VER)."
-	-echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	@echo "Forcing compiling to version $(VER)."
+	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 else
-	echo "No version specified. Using `uname -r`."
-	-uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+	@echo "No version specified. Using `uname -r`."
+	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
 
 links::
@@ -296,6 +296,11 @@ commit cvscommit hgcommit::
 push::
 	make -C .. push
 
+#################################################
+# Help
+help::
+	@cat ../INSTALL
+
 #################################################
 # build tarballs rules
 
-- 
cgit v1.2.3


From 50833699bf64e0d5966fb7fa4142fe7ee189fe8f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 18:08:40 -0300
Subject: Re-inserting strip at install rule

From: Mauro Carvalho Chehab <mchehab@infradead.org>

strip is responsible to remove all debug info from kernel object
files.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_makefile.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 8371f6a4a..6b8076a4d 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -114,7 +114,8 @@ open_makefile ("../linux/drivers/media/Makefile");
 
 # Creating Install rule
 printf OUT "install::\n";
-#printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
+printf OUT "\t\@echo \"Stripping debug info from files:\"\n";
+printf OUT "\t\@strip --strip-debug \$(inst-m)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
 	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files:\"\n";
@@ -160,5 +161,3 @@ if (open OUT,".myconfig") {
 } else {
 	system "make allmodconfig";
 }
-
-
-- 
cgit v1.2.3


From 1c45b6c1b050a3aa3207fb61e6b7628db01e8b7c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 26 Apr 2006 19:27:34 -0300
Subject: Some vars were not initializated by the script. fixed.

From: Mauro Carvalho Chehab <mchehab@infradead.org>

This avoids warnings when running make *config

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_kconfig.pl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 11392c32d..1d1155af4 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -14,7 +14,7 @@ sub add_bool($)
 	my $arg=shift;
 
 	$tristate{$arg}="bool";
-	printf "Boolean:%s\n",$arg;
+#	printf "Boolean:%s\n",$arg;
 }
 
 sub add_tristate($)
@@ -22,7 +22,7 @@ sub add_tristate($)
 	my $arg=shift;
 
 	$tristate{$arg}="tristate";
-	printf "Tristate:%s\n",$arg;
+#	printf "Tristate:%s\n",$arg;
 }
 
 sub add_config($)
@@ -154,7 +154,6 @@ print OUT "mainmenu \"V4L/DVB menu\"\n";
 
 print OUT "source Kconfig.kern\n";
 open_kconfig ("../linux","../linux/drivers/media/Kconfig");
-
 close OUT;
 
 while ( my ($key, $value) = each(%config) ) {
@@ -173,10 +172,14 @@ close OUT;
 
 if (($force_kconfig eq 1) || !open IN,".config") {
 	open OUT,">.config";
+	while ( my ($key, $value) = each(%depend) ) {
+		printf "CONFIG_%s=m\n",$key;
+		printf OUT "CONFIG_%s=m\n",$key;
+	}
 	while ( my ($key,$value) = each(%tristate) ) {
 
 		if ($key eq "DVB_AV7110_FIRMWARE") {
-				printf OUT "CONFIG_%s=n\n",$key;
+#				printf OUT "CONFIG_%s=n\n",$key;
 		} else {
 			if ($value eq "tristate") {
 				printf OUT "CONFIG_%s=m\n",$key;
-- 
cgit v1.2.3


From 9a2bbcda776b51c070c6859a114fb00b06f1e392 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 27 Apr 2006 10:29:01 -0300
Subject: Make bt866 and ks0127 work at V4L/DVB tree

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/versions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index 1d4209680..886f76fde 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -19,6 +19,7 @@ USB_ET61X251
 USB_PWC
 USB_PWC_DEBUG
 USB_ZC0301
+VIDEO_ZORAN_AVS6EYES
 
 [2.6.14]
 VIDEO_ZORAN
-- 
cgit v1.2.3


From 366fa98a817c19558aaa09755a2ce12931a35f3d Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Thu, 27 Apr 2006 09:30:20 -0400
Subject: move install / rminstall invocation rules to v4l/Makefile

From: Michael Krufky <mkrufky@linuxtv.org>

This patch moves the 'make install' and 'make rminstall' rules into the
central Makefile.  This allows for us to assign dependencies to these rules,
so that modules built as a reult of a tree-merge don't have to be installed
separately.

Now, instead of doing 'make install && make ivtv-install', the simple
command, 'make install' will call the sub-install rules and take care
of the entire task.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile                 | 7 +++++++
 v4l/scripts/make_makefile.pl | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 7814c6799..c57767940 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -114,6 +114,13 @@ export LC_ALL
 
 all:: allmodconfig default
 
+#################################################
+# installation invocation rules
+
+install:: media-install ivtv-install
+
+remove rminstall:: media-rminstall ivtv-rminstall
+
 #################################################
 # Compiling preparation rules
 
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 6b8076a4d..238c5082f 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -113,7 +113,7 @@ open OUT,">Makefile.media";
 open_makefile ("../linux/drivers/media/Makefile");
 
 # Creating Install rule
-printf OUT "install::\n";
+printf OUT "media-install::\n";
 printf OUT "\t\@echo \"Stripping debug info from files:\"\n";
 printf OUT "\t\@strip --strip-debug \$(inst-m)\n\n";
 
@@ -128,7 +128,7 @@ while ( my ($key, $value) = each(%instdir) ) {
 printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n";
 
 # Creating Remove rule
-printf OUT "remove rminstall::\n";
+printf OUT "media-rminstall::\n";
 printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
-- 
cgit v1.2.3


From 1d85ad1382917c9c7823fc420a48e1f9052287e5 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 27 Apr 2006 17:31:16 -0300
Subject: Fix building when no .version is found

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Makefile.media requires first .version. Fixed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index c57767940..e786dee21 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -124,7 +124,7 @@ remove rminstall:: media-rminstall ivtv-rminstall
 #################################################
 # Compiling preparation rules
 
-Makefile.media::
+Makefile.media:: .version
 	scripts/make_makefile.pl
 
 .version::
-- 
cgit v1.2.3


From dc9f8439dc12eaa1f581a7908ea154dffb7c1e29 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 27 Apr 2006 18:34:03 -0300
Subject: Compilation for DVB_AV7110_FIRMWARE seems to be weird

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Some systems use a previous config information to generate
a default config. This seems to cause troubles on some
systems. This patch fixes compilation for AV7110 firmware
inside V4L/DVB tree.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_kconfig.pl  | 2 +-
 v4l/scripts/make_noconfig.pl | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 1d1155af4..aebf2a950 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -179,7 +179,7 @@ if (($force_kconfig eq 1) || !open IN,".config") {
 	while ( my ($key,$value) = each(%tristate) ) {
 
 		if ($key eq "DVB_AV7110_FIRMWARE") {
-#				printf OUT "CONFIG_%s=n\n",$key;
+				printf OUT "CONFIG_%s=n\n",$key;
 		} else {
 			if ($value eq "tristate") {
 				printf OUT "CONFIG_%s=m\n",$key;
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
index 503653a4f..a81e157e2 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_noconfig.pl
@@ -31,9 +31,6 @@ while (<IN>) {
 	}
 	s/\n//;
 
-	if (m/DVB_AV7110_FIRMWARE/) {
-		next;
-	}
 	if (m/DVB_AV7110_FIRMWARE_FILE/) {
 		next;
 	}
-- 
cgit v1.2.3


From 7381f005d9aca7e01befb8b00597396d03e337dd Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 27 Apr 2006 19:01:14 -0300
Subject: Fixed a bug at make menuconfig

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index e786dee21..318d7f753 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -235,10 +235,9 @@ menuconfig:: links .version
 			if [ ! -f $(KDIR)/scripts/kconfig/lxdialog ]; then \
 				$(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \
 			fi; \
-		else \
-			if [ ! -f $(KDIR)/scripts/kconfig/mconf ]; then \
-				$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \
-			fi; \
+		fi; \
+		if [ ! -f $(KDIR)/scripts/kconfig/mconf ]; then \
+			$(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \
 		fi; \
 		ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \
 	fi
-- 
cgit v1.2.3


From 761ff2c05b56e086da5a180666c4d9160155c4ec Mon Sep 17 00:00:00 2001
From: Andrew de Quincey <adq_dvb@lidskialf.net>
Date: Fri, 28 Apr 2006 01:45:01 +0100
Subject: Convert lnbp21 to a module

From: Andrew de Quincey <adq_dvb@lidskialf.net>

Convert lnbp21.h into a linux kernel module.
Fix up previous users to use it.
Convert dvb-ttusb-budget to use it.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
---
 v4l/versions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index 886f76fde..0ebc1dce1 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -192,6 +192,7 @@ DVB_OR51211
 DVB_OR51132
 DVB_BCM3510
 DVB_LGDT330X
+DVB_LNBP21
 VIDEO_SAA7146
 VIDEO_SAA7146_VV
 VIDEO_VIDEOBUF
-- 
cgit v1.2.3


From b5fe0362594b93998d9ab6c01554cc2b9dd95951 Mon Sep 17 00:00:00 2001
From: Andrew de Quincey <adq_dvb@lidskialf.net>
Date: Fri, 28 Apr 2006 01:45:09 +0100
Subject: Add isl6421 module

From: Andrew de Quincey <adq_dvb@lidskialf.net>

Driver for the ISL6421 LNB chip

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
---
 v4l/versions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index 0ebc1dce1..b642f60da 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -193,6 +193,7 @@ DVB_OR51132
 DVB_BCM3510
 DVB_LGDT330X
 DVB_LNBP21
+DVB_ISL6421
 VIDEO_SAA7146
 VIDEO_SAA7146_VV
 VIDEO_VIDEOBUF
-- 
cgit v1.2.3


From c460d095132c434e7c9b7e6c07ac34fef2c71557 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 28 Apr 2006 09:34:06 -0300
Subject: Improved make release method to allow compiling against an arbitrary
 dir

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, with make DIR=<foo>, it is possible to compile V4L/DVB with a
non-installed dir. This will allow better checking on compatibility issues
(especially for -git tree)


Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/Makefile | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 8 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 318d7f753..58b160397 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -2,10 +2,31 @@ ifeq ($(obj),)
 obj = .
 endif
 
+#################################################
+# Version Check
+
+ifneq ($(KERNELRELEASE),)
+
+-include $(TOPDIR)/Rules.make
+
+else
+
+# take version info from last module build if available
+-include $(obj)/.version
+
+ifneq ($(SRCDIR),)
+KDIR := $(SRCDIR)
+else
+KDIR := /lib/modules/$(KERNELRELEASE)/build
+endif
+
+endif
+
 #################################################
 # default compilation rule
 
 default:: Makefile.media links .version
+	echo srcdir $(SRCDIR)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
 #################################################
@@ -42,20 +63,18 @@ EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
 # Kernel 2.4/2.6 specific rules
 
 ifneq ($(KERNELRELEASE),)
+
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  export-objs	:=
  list-multi	:=
 else
+include $(obj)/Makefile.kern24
+
  multi-m	:= $(filter $(list-multi), $(obj-m))
  int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
  export-objs	:= $(filter $(int-m) $(obj-m),$(export-objs))
 endif
 
-include $(obj)/Makefile.kern24
--include $(TOPDIR)/Rules.make
-else
-# take version info from last module build if available
--include $(obj)/.version
 endif
 
 #################################################
@@ -67,11 +86,9 @@ SNAPSHOT_CFLAGS	:= -DSNAPSHOT='$(shell cat $(snapshot))'
 EXTRA_CFLAGS	+= $(SNAPSHOT_CFLAGS)
 endif
 
-KDIR		:= /lib/modules/$(KERNELRELEASE)/build
 PWD		:= $(shell pwd)
-DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
+DEST		:= /lib/modules/$(KERNELRELEASE)/v4l2
 KDIR26		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/media
-KDIRUSB		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
 
 #################################################
 # Compiler fixup rules
@@ -130,6 +147,9 @@ Makefile.media:: .version
 .version::
 ifneq ($(KERNELRELEASE),)
 	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+ifneq ($(SRCDIR),)
+	@echo -e SRCDIR=$(SRCDIR)\\n >> $(obj)/.version
+endif
 else
 	@echo "No version yet."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
@@ -139,10 +159,29 @@ release::
 ifneq ($(VER),)
 	@echo "Forcing compiling to version $(VER)."
 	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
+else
+ifneq ($(DIR),)
+	@perl -e 'open IN,"<$(DIR)/Makefile"; \
+		while (<IN>) { \
+			if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; next; }\
+			if (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; next; }\
+			if (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; next; }\
+			if (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; next; }\
+		}; \
+		printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n", \
+		$$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra); \
+		printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
+	@cat .version|grep KERNELRELEASE:|sed s,'KERNELRELEASE:=','Forcing compiling to version ',
+
+	@if [ ! -f $(DIR)/scripts/kallsyms ]; then \
+		echo "*** Warning: You should configure and build kernel before compiling V4L"; \
+	fi
+
 else
 	@echo "No version specified. Using `uname -r`."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
+endif
 
 links::
 	@echo creating symbolic links...
-- 
cgit v1.2.3


From 91a3da5165321c89bb4a35937d47f19ac53f8899 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 2 May 2006 09:29:34 -0300
Subject: Fix checking logic for a broken xawtv version

From: Mauro Carvalho Chehab <mchehab@infradead.org>


moved from if to ifndef.
Also added such tests at gentree script. Gentree updated to its latest
version.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/gentree.pl | 77 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 27 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl
index 0ae296b93..de91722a7 100755
--- a/v4l/scripts/gentree.pl
+++ b/v4l/scripts/gentree.pl
@@ -2,12 +2,10 @@
 use strict;
 use File::Find;
 use Fcntl ':mode';
-use Cwd;
 
 my $VER = shift;
 my $SRC = shift;
 my $DESTDIR = shift;
-my $cwd;
 my $extra;
 
 
@@ -70,9 +68,9 @@ sub filter_source ($$) {
 		if ($line =~ m/^#include \"compat.h\"/) {
 			next;
 		}
-		if ($line =~ m/[\$]Id:/) {
-			next;
-		}
+#		if ($line =~ m/[\$]Id:/) {
+#			next;
+#		}
 		if ($line =~ /^#ifdef MM_KERNEL/) {
 			chomp($line);
 			$state{$level} = "if";
@@ -81,8 +79,12 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
-		if ($line =~ /^\s*#if 0\s.*[Kk][Ee][Ee][Pp].*/) {
-			print OUT "#if 0\n";
+		if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
+			if ($1 eq ";") {
+				print OUT "#if 0\n";
+			} else {
+				print OUT "#if 0$1\n";
+			}
 			chomp($line);
 			$state{$level} = "ifother";
 			$if{$level} = 0;
@@ -90,6 +92,30 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
+		if ($line =~ /^#ifdef\sSTV0297_CS2/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 0;
+			print STDERR "/* BP #if 0 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
+		if ($line =~ /^#ifndef\sBROKEN_XAWTV/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 1;
+			print STDERR "/* BP #if 0 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
+		if ($line =~ /^#ifndef\sSTV0297_CS2/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 1;
+			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
 		if ($line =~ /^#if 0/) {
 			chomp($line);
 			$state{$level} = "if";
@@ -98,8 +124,8 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
-		if ($line =~ /^#if 1\s.*[Kk][Ee][Ee][Pp].*/) {
-			print OUT "#if 1\n";
+		if ($line =~ m|^\s*\#if\s+1\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
+			print OUT "#if 1$1\n";
 			$state{$level} = "ifother";
 			$if{$level} = 1;
 			print STDERR "/* BP #if 1 (keep) state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
@@ -122,15 +148,15 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
-		if ($line =~ /^#if.*I2C_CLASS_TV_ANALOG/) {
+		if ($line =~ /^#if.*CONFIG_XC3028/) {
 			chomp($line);
 			$state{$level} = "if";
-			$if{$level} = 1;
+			$if{$level} = 0;
 			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
 			$level++;
 			next;
 		}
-		if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) {
+		if ($line =~ /^#if.*I2C_CLASS_TV_ANALOG/) {
 			chomp($line);
 			$state{$level} = "if";
 			$if{$level} = 1;
@@ -138,22 +164,22 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
-		if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) {
+		if ($line =~ /^#ifndef.\s*I2C_PEC/) {
 			chomp($line);
 			$state{$level} = "if";
-			$if{$level} = 1;
+			$if{$level} = 0;
 			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
 			$level++;
 			next;
 		}
-		if ($line =~ /^#if.*CONFIG_XC3028/) {
+		if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) {
 			chomp($line);
 			$state{$level} = "if";
-			$if{$level} = 0;
-			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level$
+			$if{$level} = 1;
+			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
 			$level++;
 			next;
-                }
+		}
 		if ($line =~ /^#if.*BTTV_VERSION_CODE/) {
 			chomp($line);
 			$line =~ s@^#if\s*@@;
@@ -280,9 +306,7 @@ sub parse_dir {
 		return;
 	}
 
-	my $mode = (lstat("$cwd/$file"))[2];
-
-#	printf "Permissions of %s/%s are %04o (dir=%s\n", $cwd,$file, $mode, cwd;
+	my $mode = (lstat("$file"))[2];
 
 	if ($mode & S_IFDIR) {
 		return;
@@ -291,14 +315,14 @@ sub parse_dir {
 	$srcdir =~ s/(.)/\[$1\]/g;
 	my $f2 = $file;
 
-	$f2 =~ s,^$srcdir,$cwd/$DESTDIR/,;
+	$f2 =~ s,^$srcdir,$DESTDIR/,;
 	print "from $file to $f2\n";
 
 	my $tmp = "/tmp/src.$$";
 	if ($file =~ m/.*\.[ch]$/) {
-		filter_source("$cwd/$file","$tmp");
+		filter_source("$file","$tmp");
 	} else {
-	system("cp $cwd/$file $tmp");
+	system("cp $file $tmp");
 	}
 
 	my $dir = $f2;
@@ -315,12 +339,11 @@ sub parse_dir {
 
 my $patchtmploc = "/tmp/temp.patch";
 
-printf STDERR <<EOF,$VER,$CODE;
+printf <<EOF,$VER,$CODE;
 kernel is %s (0x%x)
 EOF
 
-print STDERR "finding files at $SRC\n";
+print "finding files at $SRC\n";
 
-$cwd=cwd;
 
 find(\&parse_dir, $SRC);
-- 
cgit v1.2.3


From e7db9b9952eddc8ac52a8a902ad1af7b048c8e17 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 2 May 2006 15:44:02 -0300
Subject: Removed obsoleted CVS files

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Those files were used on cvs tree. they make no sense for hg.
kenel-sync:

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/.cvsignore | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 v4l/.cvsignore

(limited to 'v4l')

diff --git a/v4l/.cvsignore b/v4l/.cvsignore
deleted file mode 100644
index 88be5bcbc..000000000
--- a/v4l/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.ko
-*.o.flags
-*.mod.c
-.*.cmd
-.version
-.snapshot
-.tmp_versions
-- 
cgit v1.2.3


From 27e0a2e8659f2e3e37b7781c322647040d3566c3 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 7 May 2006 18:29:49 -0400
Subject: fix ability to pass compile-time build options when building from the
 hg repo

From: Michael Krufky <mkrufky@linuxtv.org>

When building in-kernel, compile-time build options are passed into the
compiler using '#include <linux/config.h>' .  This file #include's
<linux/autoconf.h> , which is created on the fly by the kbuild system.

However, this does not work correctly when building from the mercurial
repository, since the kernel is built indepentently of v4l/.myconfig

This creates a "config-compat.h", which will be #include'd by compat.h
and will emulate <linux/config.h> for the local build.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile             | 20 ++++++++++++++++++--
 v4l/compat.h             |  1 +
 v4l/scripts/makelinks.sh |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 58b160397..3ba4603f3 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -25,7 +25,7 @@ endif
 #################################################
 # default compilation rule
 
-default:: Makefile.media links .version
+default:: config-compat.h Makefile.media links .version
 	echo srcdir $(SRCDIR)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
@@ -188,6 +188,22 @@ links::
 	@find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
 	@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
 
+config-compat.h:: .myconfig
+	@echo \#ifndef __CONFIG_COMPAT_H__ > config-compat.h
+	@echo \#define __CONFIG_COMPAT_H__ >> config-compat.h
+	@echo >> config-compat.h
+	@echo \#include \<linux\/config\.h\> >> config-compat.h
+	@echo >> config-compat.h
+	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
+		sed s/"CONFIG\_"/"\#undef CONFIG\_"/1 | \
+		sed s/"\:\= ."/""/1 >> config-compat.h >> config-compat.h
+	@echo >> config-compat.h
+	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
+		sed s/"CONFIG\_"/"\#define CONFIG\_"/1 | \
+		sed s/"\:\="/""/1 >> config-compat.h >> config-compat.h
+	@echo >> config-compat.h
+	@echo \#endif >> config-compat.h
+
 kernel-links makelinks::
 	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
 
@@ -204,7 +220,7 @@ clean::
 	@find . -name '*.c' -type l -exec rm '{}' \;
 	@find . -name '*.h' -type l -exec rm '{}' \;
 	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
-		ivtv-svnversion.h 
+		ivtv-svnversion.h config-compat.h
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d Makefile.media \
diff --git a/v4l/compat.h b/v4l/compat.h
index 0bcb238fb..b9138c7be 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -10,6 +10,7 @@
 #include <linux/version.h>
 #include <linux/utsname.h>
 #include <linux/sched.h>
+#include "config-compat.h"
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
 # define minor(x) MINOR(x)
diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index a66989771..03fd48849 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -39,10 +39,12 @@ done
 
 for x in `find include -type d | grep -v CVS` ; do
 	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+	touch $1/$x/config-compat.h
 done
 
 for x in `find drivers/media -type d | grep -v CVS` ; do
 	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+	touch $1/$x/config-compat.h
 done
 
 cd ..
-- 
cgit v1.2.3


From a538afc7e66765d307ffd0e6d15eace695f69188 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 8 May 2006 17:50:08 -0400
Subject: fix warning: extra tokens at end of #undef directive

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 v4l/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/Makefile b/v4l/Makefile
index 3ba4603f3..b8eba1a44 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -196,7 +196,7 @@ config-compat.h:: .myconfig
 	@echo >> config-compat.h
 	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
 		sed s/"CONFIG\_"/"\#undef CONFIG\_"/1 | \
-		sed s/"\:\= ."/""/1 >> config-compat.h >> config-compat.h
+		sed s/"\:\= .*"/""/1 >> config-compat.h >> config-compat.h
 	@echo >> config-compat.h
 	@grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \
 		sed s/"CONFIG\_"/"\#define CONFIG\_"/1 | \
-- 
cgit v1.2.3


From acbc613601ba93f26adb3ba1d91aabeff718298b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 17 May 2006 15:43:51 -0300
Subject: Fix compilation for Miropcm20 and Cinergy

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Miropcm compilation were assuming to compile under
linux/drivers/media/video, but this is not true when compiling in-tree.

Also, make allyesconfig were making "y" to an advanced configuration for
Cinergy.

gentree.pl also updated.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/gentree.pl      | 24 ++++++++++++++++++++++++
 v4l/scripts/make_kconfig.pl |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'v4l')

diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl
index de91722a7..e58d410c2 100755
--- a/v4l/scripts/gentree.pl
+++ b/v4l/scripts/gentree.pl
@@ -79,6 +79,14 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
+		if ($line =~ /^#ifdef _COMPAT_H/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 0;
+			print STDERR "/* BP #if MM_KERNEL state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
 		if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
 			if ($1 eq ";") {
 				print OUT "#if 0\n";
@@ -164,6 +172,14 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
+		if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 1;
+			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
 		if ($line =~ /^#ifndef.\s*I2C_PEC/) {
 			chomp($line);
 			$state{$level} = "if";
@@ -172,6 +188,14 @@ sub filter_source ($$) {
 			$level++;
 			next;
 		}
+		if ($line =~ /^#ifdef.\s*I2C_PEC/) {
+			chomp($line);
+			$state{$level} = "if";
+			$if{$level} = 1;
+			print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+			$level++;
+			next;
+		}
 		if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) {
 			chomp($line);
 			$state{$level} = "if";
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index aebf2a950..c4212d427 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -178,7 +178,8 @@ if (($force_kconfig eq 1) || !open IN,".config") {
 	}
 	while ( my ($key,$value) = each(%tristate) ) {
 
-		if ($key eq "DVB_AV7110_FIRMWARE") {
+		if ( ($key eq "DVB_AV7110_FIRMWARE") ||
+		     ($key eq "DVB_CINERGYT2_TUNING") ) {
 				printf OUT "CONFIG_%s=n\n",$key;
 		} else {
 			if ($value eq "tristate") {
-- 
cgit v1.2.3


From 476643d84ea8e669f1e1709af2040f2a25f75dd4 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 17 May 2006 15:58:05 -0300
Subject: Added Logitech Quickcam USB support to versions.txt

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/versions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'v4l')

diff --git a/v4l/versions.txt b/v4l/versions.txt
index b642f60da..1e71513fa 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -15,6 +15,7 @@ VIDEO_USBVIDEO
 USB_VICAM
 USB_IBMCAM
 USB_KONICAWC
+USB_QUICKCAM_MESSENGER
 USB_ET61X251
 USB_PWC
 USB_PWC_DEBUG
-- 
cgit v1.2.3


From 122bd90fa6f72e1366146662e7fb9a6581aab68e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 17 May 2006 17:58:50 -0300
Subject: Removed a broken code inside make_kconfig

From: Mauro Carvalho Chehab <mchehab@infradead.org>

This code were not working, and were obsoleted by the while just
bellow, that checks only for tristate and boolean parameters.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 v4l/scripts/make_kconfig.pl | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index c4212d427..04430ccf2 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -172,10 +172,6 @@ close OUT;
 
 if (($force_kconfig eq 1) || !open IN,".config") {
 	open OUT,">.config";
-	while ( my ($key, $value) = each(%depend) ) {
-		printf "CONFIG_%s=m\n",$key;
-		printf OUT "CONFIG_%s=m\n",$key;
-	}
 	while ( my ($key,$value) = each(%tristate) ) {
 
 		if ( ($key eq "DVB_AV7110_FIRMWARE") ||
-- 
cgit v1.2.3