lkml.org 
[lkml]   [2022]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the pci tree with Linus' tree
Hi Sergio,

On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@gmail.com> wrote:
>
> On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > diff --cc drivers/pci/controller/Kconfig
> > index aec8c9a3488b,f7e44d9c6965..000000000000
> > --- a/drivers/pci/controller/Kconfig
> > +++ b/drivers/pci/controller/Kconfig
> > @@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
> > If unsure, say Y if you have an Apple Silicon system.
> >
> > config PCIE_MT7621
> > - tristate "MediaTek MT7621 PCIe Controller"
> > + bool "MediaTek MT7621 PCIe Controller"
>
> This should be tristate.
>
> > - depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
> > + depends on SOC_MT7621 || COMPILE_TEST
>
> This is correct,
>
> > select PHY_MT7621_PCI
> > default SOC_MT7621
> > help

Thanks, I have fixed up my merge resolution for Monday.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-01-14 07:53    [W:0.064 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site