From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <5693930C.3050402@mleia.com> Date: Mon, 11 Jan 2016 13:33:32 +0200 From: Vladimir Zapolskiy MIME-Version: 1.0 To: Michael Turquette , Stephen Boyd CC: Joachim Eastwood , linux-clk@vger.kernel.org Subject: Re: [PATCH] clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig References: <1452136027-32076-1-git-send-email-vz@mleia.com> In-Reply-To: <1452136027-32076-1-git-send-email-vz@mleia.com> Content-Type: text/plain; charset=windows-1252 List-ID: Hi Mike, Stephen, On 07.01.2016 05:07, Vladimir Zapolskiy wrote: > Presumably the second COMMON_CLK_NXP config option in > drivers/clk/Kconfig appeared after a merge conflict resolution, remove > the wrong record of two. > > Signed-off-by: Vladimir Zapolskiy > --- > Hi Mike, Stephen, > > I've found this issue in clk-next while working on something else, > please consider to include this change to clk-next, no objections if > it is squashed with f7c82a60ba2 ("clk: lpc32xx: add common clock > framework driver"). > > In fact it is a revert of 8a896310a7e ("clk: lpc18xx: add NXP specific > COMMON_CLK_NXP configuration symbol"), but this preparatory change is > good as is. > > The original change doesn't have this kind of a problem (see > http://www.spinics.net/lists/devicetree/msg105709.html), so I > believe it is caused by a merge conflict, probably after done > alphabetical sorting. please consider to include this change before sending a pull request this merge window. With best wishes, Vladimir > drivers/clk/Kconfig | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig > index 41f6c7f..eca8e01 100644 > --- a/drivers/clk/Kconfig > +++ b/drivers/clk/Kconfig > @@ -187,11 +187,6 @@ config COMMON_CLK_PWM > Adapter driver so that any PWM output can be (mis)used as clock signal > at 50% duty cycle. > > -config COMMON_CLK_NXP > - def_bool COMMON_CLK && ARCH_LPC18XX > - ---help--- > - Support for clock providers on NXP platforms. > - > config COMMON_CLK_PXA > def_bool COMMON_CLK && ARCH_PXA > ---help--- >