Alexei Colin <aco...@isi.edu> writes: > The menu entry is now defined in the rapidio subtree. Also, re-order > the bus menu so tha the platform-specific RapidIO controller appears > after the entry for the RapidIO subsystem. > > Platforms with a PCI bus will be offered the RapidIO menu since they may > be want support for a RapidIO PCI device. Platforms without a PCI bus > that might include a RapidIO IP block will need to "select HAS_RAPIDIO" > in the platform-/machine-specific "config ARCH_*" Kconfig entry. > > Cc: Andrew Morton <a...@linux-foundation.org> > Cc: John Paul Walters <jwalt...@isi.edu> > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-ker...@vger.kernel.org > Signed-off-by: Alexei Colin <aco...@isi.edu> > --- > arch/powerpc/Kconfig | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-)
Looks good. Acked-by: Michael Ellerman <m...@ellerman.id.au> (powerpc) cheers > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 25d005af0a5b..17ea8a5f90a0 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -993,16 +993,7 @@ source "drivers/pci/Kconfig" > > source "drivers/pcmcia/Kconfig" > > -config HAS_RAPIDIO > - bool > - default n > - > -config RAPIDIO > - tristate "RapidIO support" > - depends on HAS_RAPIDIO || PCI > - help > - If you say Y here, the kernel will include drivers and > - infrastructure code to support RapidIO interconnect devices. > +source "drivers/rapidio/Kconfig" > > config FSL_RIO > bool "Freescale Embedded SRIO Controller support" > @@ -1012,8 +1003,6 @@ config FSL_RIO > Include support for RapidIO controller on Freescale embedded > processors (MPC8548, MPC8641, etc). > > -source "drivers/rapidio/Kconfig" > - > endmenu > > config NONSTATIC_KERNEL > -- > 2.18.0
