From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Arnaud Lacombe <lacombar@gmail.com>, Michal Marek <mmarek@suse.cz>
Cc: linux-kbuild@vger.kernel.org, linux-media@vger.kernel.org
Subject: Re: [PATCH 0/5] Re: REGRESSION: Re: [GIT] kconfig rc fixes
Date: Tue, 09 Nov 2010 15:32:31 -0200 [thread overview]
Message-ID: <4CD985AF.4040706@redhat.com> (raw)
In-Reply-To: <1289079027-3037-1-git-send-email-lacombar@gmail.com>
Hi Arnaud,
Em 06-11-2010 19:30, Arnaud Lacombe escreveu:
> Hi,
>
> This should do the job.
>
> A.
>
> Arnaud Lacombe (5):
> kconfig: add an option to determine a menu's visibility
> kconfig: regen parser
> Revert "i2c: Fix Kconfig dependencies"
> media/video: convert Kconfig to use the menu's `visible' keyword
> i2c/algos: convert Kconfig to use the menu's `visible' keyword
>
> drivers/i2c/Kconfig | 3 +-
> drivers/i2c/algos/Kconfig | 14 +-
> drivers/media/video/Kconfig | 2 +-
> scripts/kconfig/expr.h | 1 +
> scripts/kconfig/lkc.h | 1 +
> scripts/kconfig/menu.c | 11 +
> scripts/kconfig/zconf.gperf | 1 +
> scripts/kconfig/zconf.hash.c_shipped | 122 ++++----
> scripts/kconfig/zconf.tab.c_shipped | 570 +++++++++++++++++----------------
> scripts/kconfig/zconf.y | 21 +-
> 10 files changed, 393 insertions(+), 353 deletions(-)
Patches look OK to my eyes. One more patch is needed, in order to fix build
warnings when customise is enabled for tuners and/or for DVB frontends.
I'm enclosing the fix.
For this patch series:
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Michal,
Would you apply those fixes to your tree, or do you prefer if I send them via
my tree?
Thanks,
Mauro
---
commit f53404d53c026548e03444f7ed33e8027716425d
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue Nov 9 15:29:05 2010 -0200
[media] Fix Kconfig errors due to two visible menus
Use the new visible Kconfig keyword to avoid producing error for two menus
that are visible only if Tuner/frontend customise options are enabled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 2385e6c..78b0895 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -31,7 +31,7 @@ config MEDIA_TUNER
select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE
-menuconfig MEDIA_TUNER_CUSTOMISE
+config MEDIA_TUNER_CUSTOMISE
bool "Customize analog and hybrid tuner modules to build"
depends on MEDIA_TUNER
default y if EMBEDDED
@@ -44,7 +44,8 @@ menuconfig MEDIA_TUNER_CUSTOMISE
If unsure say N.
-if MEDIA_TUNER_CUSTOMISE
+menu "Customize TV tuners"
+ visible if MEDIA_TUNER_CUSTOMISE
config MEDIA_TUNER_SIMPLE
tristate "Simple tuner support"
@@ -185,5 +186,4 @@ config MEDIA_TUNER_TDA18218
default m if MEDIA_TUNER_CUSTOMISE
help
NXP TDA18218 silicon tuner driver.
-
-endif # MEDIA_TUNER_CUSTOMISE
+endmenu
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index e9062b0..96b2701 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -12,9 +12,8 @@ config DVB_FE_CUSTOMISE
If unsure say N.
-if DVB_FE_CUSTOMISE
-
menu "Customise DVB Frontends"
+ visible if DVB_FE_CUSTOMISE
comment "Multistandard (satellite) frontends"
depends on DVB_CORE
@@ -619,5 +618,3 @@ config DVB_DUMMY_FE
tristate "Dummy frontend driver"
default n
endmenu
-
-endif
next prev parent reply other threads:[~2010-11-09 17:32 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 22:40 [GIT] kconfig rc fixes Michal Marek
2010-11-03 22:29 ` REGRESSION: " Mauro Carvalho Chehab
2010-11-03 22:47 ` Michal Marek
2010-11-03 23:02 ` Mauro Carvalho Chehab
2010-11-04 2:31 ` Arnaud Lacombe
2010-11-04 3:19 ` Mauro Carvalho Chehab
2010-11-04 4:02 ` Arnaud Lacombe
2010-11-04 4:15 ` Arnaud Lacombe
2010-11-04 11:10 ` Mauro Carvalho Chehab
2010-11-04 17:19 ` Randy Dunlap
2010-11-04 18:11 ` Mauro Carvalho Chehab
2010-11-04 18:32 ` Arnaud Lacombe
2010-11-04 18:51 ` Mauro Carvalho Chehab
2010-11-05 12:02 ` Jean Delvare
2010-11-06 21:30 ` [PATCH 0/5] " Arnaud Lacombe
2010-11-06 22:28 ` Mauro Carvalho Chehab
2010-11-09 17:32 ` Mauro Carvalho Chehab [this message]
2010-11-06 21:30 ` [PATCH 1/5] kconfig: add an option to determine a menu's visibility Arnaud Lacombe
2010-11-15 16:57 ` Arnaud Lacombe
2010-11-16 17:44 ` Mauro Carvalho Chehab
2010-11-16 21:41 ` Arnaud Lacombe
2010-11-16 21:52 ` Sam Ravnborg
2010-11-25 17:06 ` Arnaud Lacombe
2010-11-25 19:09 ` Sam Ravnborg
2010-11-26 10:31 ` Michal Marek
2010-11-26 16:15 ` Michal Marek
2010-11-26 16:17 ` Randy Dunlap
2010-11-26 16:41 ` Arnaud Lacombe
2011-04-28 17:38 ` Randy Dunlap
2011-05-02 15:33 ` Michal Marek
2010-11-26 16:41 ` Arnaud Lacombe
2010-11-26 16:54 ` Arnaud Lacombe
2010-11-26 17:19 ` Mauro Carvalho Chehab
2010-11-06 21:30 ` [PATCH 2/5] kconfig: regen parser Arnaud Lacombe
2010-11-06 21:30 ` [PATCH 3/5] Revert "i2c: Fix Kconfig dependencies" Arnaud Lacombe
2010-11-06 21:30 ` [PATCH 4/5] media/video: convert Kconfig to use the menu's `visible' keyword Arnaud Lacombe
2010-11-06 21:30 ` [PATCH 5/5] i2c/algos: " Arnaud Lacombe
2010-11-04 18:34 ` REGRESSION: Re: [GIT] kconfig rc fixes Arnaud Lacombe
2010-11-04 18:43 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CD985AF.4040706@redhat.com \
--to=mchehab@redhat.com \
--cc=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mmarek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.