| Message ID | 1444771901-24460-5-git-send-email-antoine.tenart@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13.10.2015 23:31, Antoine Tenart wrote: > Reorder the statements under the PINCTRL_BERLIN_BG4CT config > option to be consistent with the existing. > > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> If this is the only patch that requires the dependency with Jisheng's pending patches, can you two agree on squashing it into Jisheng's patch set? Sebastian > --- > drivers/pinctrl/berlin/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig > index cf95b4d7f7e3..8fe6ad7795dc 100644 > --- a/drivers/pinctrl/berlin/Kconfig > +++ b/drivers/pinctrl/berlin/Kconfig > @@ -21,8 +21,8 @@ config PINCTRL_BERLIN_BG2Q > select PINCTRL_BERLIN > > config PINCTRL_BERLIN_BG4CT > - depends on OF > bool "Marvell berlin4ct pin controller driver" > + depends on OF > select PINCTRL_BERLIN > > endif >
Sebastian, On Thu, Oct 15, 2015 at 11:46:15PM +0200, Sebastian Hesselbarth wrote: > On 13.10.2015 23:31, Antoine Tenart wrote: > >Reorder the statements under the PINCTRL_BERLIN_BG4CT config > >option to be consistent with the existing. > > > >Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> > > If this is the only patch that requires the dependency with > Jisheng's pending patches, can you two agree on squashing it > into Jisheng's patch set? Yes, this is the only one. Squashing them would be great! Antoine
On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart <antoine.tenart@free-electrons.com> wrote: > Reorder the statements under the PINCTRL_BERLIN_BG4CT config > option to be consistent with the existing. > > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> I assume this was squashed into Jisheng's patchset as mentioned in the thread because it doesn't apply after I applied Jisheng's v7 patches. So dropping this. Yours, Linus Walleij
Linus, On Fri, Oct 16, 2015 at 04:22:35PM +0200, Linus Walleij wrote: > On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart > <antoine.tenart@free-electrons.com> wrote: > > > Reorder the statements under the PINCTRL_BERLIN_BG4CT config > > option to be consistent with the existing. > > > > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> > > I assume this was squashed into Jisheng's patchset as mentioned > in the thread because it doesn't apply after I applied Jisheng's > v7 patches. Yes, this was squashed into Jisheng's series. Antoine
diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig index cf95b4d7f7e3..8fe6ad7795dc 100644 --- a/drivers/pinctrl/berlin/Kconfig +++ b/drivers/pinctrl/berlin/Kconfig @@ -21,8 +21,8 @@ config PINCTRL_BERLIN_BG2Q select PINCTRL_BERLIN config PINCTRL_BERLIN_BG4CT - depends on OF bool "Marvell berlin4ct pin controller driver" + depends on OF select PINCTRL_BERLIN endif
Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- drivers/pinctrl/berlin/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)