• Linus Torvalds's avatar
    Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 19530313
    Linus Torvalds authored
    Pull Kconfig file consolidation from Masahiro Yamada:
     "Consolidation of bus (PCI, PCMCIA, EISA, RapidIO) config entries by
      Christoph Hellwig.
    
      Currently, every architecture that wants to provide common peripheral
      busses needs to add some boilerplate code and include the right
      Kconfig files. This series instead just selects the presence (when
      needed) and then handles everything in the bus-specific Kconfig file
      under drivers/"
    
    * tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
      pcmcia: remove per-arch PCMCIA config entry
      eisa: consolidate EISA Kconfig entry in drivers/eisa
      rapidio: consolidate RAPIDIO config entry in drivers/rapidio
      pcmcia: allow PCMCIA support independent of the architecture
      PCI: consolidate the PCI_SYSCALL symbol
      PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options
      PCI: consolidate PCI config entry in drivers/pci
      MIPS: remove the HT_PCI config option
    19530313