diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-29 22:40:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-29 22:40:29 +0100 |
| commit | 195303136f192d37b89e20a8d1d2670d0d825266 (patch) | |
| tree | 7d317a4ae75b0563f779a0dca2d562c9029ef0e0 /arch/powerpc/platforms/Kconfig | |
| parent | Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ma... (diff) | |
| parent | pcmcia: remove per-arch PCMCIA config entry (diff) | |
| download | linux-195303136f192d37b89e20a8d1d2670d0d825266.tar.xz linux-195303136f192d37b89e20a8d1d2670d0d825266.zip | |
Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
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
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 5c48dd823e15..f3fb79fccc72 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -265,7 +265,7 @@ config CPM2 bool "Enable support for the CPM2 (Communications Processor Module)" depends on (FSL_SOC_BOOKE && PPC32) || 8260 select CPM - select PPC_PCI_CHOICE + select HAVE_PCI select GPIOLIB help The CPM2 (Communications Processor Module) is a coprocessor on |