diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-24 18:43:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-24 18:43:11 -0300 |
| commit | d51c5dc0968d35384c2ee7960018457e81f72970 (patch) | |
| tree | 87d001a2123fdb5b1fec9570d1c5586ed1028c8f /v4l | |
| parent | 8541186fb1657556a4298819391bec45d26d6393 (diff) | |
| parent | 9b46c2b9f7db1a87a4ad91531c3e390a8b1317fc (diff) | |
| download | mediapointer-dvb-s2-d51c5dc0968d35384c2ee7960018457e81f72970.tar.gz mediapointer-dvb-s2-d51c5dc0968d35384c2ee7960018457e81f72970.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb-tuner-refactor
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 19 | ||||
| -rwxr-xr-x | v4l/scripts/make_noconfig.pl | 4 | ||||
| -rw-r--r-- | v4l/versions.txt | 5 |
3 files changed, 25 insertions, 3 deletions
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 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; diff --git a/v4l/versions.txt b/v4l/versions.txt index 255a31b17..1d4209680 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -17,7 +17,7 @@ USB_IBMCAM USB_KONICAWC USB_ET61X251 USB_PWC -USB_SN9C102 +USB_PWC_DEBUG USB_ZC0301 [2.6.14] @@ -75,6 +75,9 @@ RADIO_TYPHOON_MUTEFREQ RADIO_ZOLTRIX RADIO_ZOLTRIX_PORT +[2.6.13] +USB_SN9C102 + [2.6.12] VIDEO_VIVI VIDEO_DEV |