diff options
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Makefile | 2 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 2 | ||||
| -rwxr-xr-x | v4l/scripts/make_noconfig.pl | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile index a690730ac..c98c8e013 100644 --- a/linux/drivers/media/dvb/ttpci/Makefile +++ b/linux/drivers/media/dvb/ttpci/Makefile @@ -15,7 +15,7 @@ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ hostprogs-y := fdump -ifdef CONFIG_DVB_AV7110_FIRMWARE +ifeq (CONFIG_DVB_AV7110_FIRMWARE,y) $(obj)/av7110.o: $(obj)/fdump $(obj)/av7110_firm.h $(obj)/av7110_firm.h: 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; } |