Commit 19530313 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 769e4709 5cfc879c
...@@ -7,6 +7,9 @@ config ALPHA ...@@ -7,6 +7,9 @@ config ALPHA
select ARCH_NO_PREEMPT select ARCH_NO_PREEMPT
select ARCH_NO_SG_CHAIN select ARCH_NO_SG_CHAIN
select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_CMPXCHG_LOCKREF
select FORCE_PCI if !ALPHA_JENSEN
select PCI_DOMAINS if PCI
select PCI_SYSCALL if PCI
select HAVE_AOUT select HAVE_AOUT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
...@@ -16,6 +19,7 @@ config ALPHA ...@@ -16,6 +19,7 @@ config ALPHA
select NEED_SG_DMA_LENGTH select NEED_SG_DMA_LENGTH
select VIRT_TO_BUS select VIRT_TO_BUS
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_PCI_IOMAP if PCI
select AUTO_IRQ_AFFINITY if SMP select AUTO_IRQ_AFFINITY if SMP
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
...@@ -126,11 +130,13 @@ choice ...@@ -126,11 +130,13 @@ choice
config ALPHA_GENERIC config ALPHA_GENERIC
bool "Generic" bool "Generic"
depends on TTY depends on TTY
select HAVE_EISA
help help
A generic kernel will run on all supported Alpha hardware. A generic kernel will run on all supported Alpha hardware.
config ALPHA_ALCOR config ALPHA_ALCOR
bool "Alcor/Alpha-XLT" bool "Alcor/Alpha-XLT"
select HAVE_EISA
help help
For systems using the Digital ALCOR chipset: 5 chips (4, 64-bit data For systems using the Digital ALCOR chipset: 5 chips (4, 64-bit data
slices (Data Switch, DSW) - 208-pin PQFP and 1 control (Control, I/O slices (Data Switch, DSW) - 208-pin PQFP and 1 control (Control, I/O
...@@ -203,6 +209,7 @@ config ALPHA_EIGER ...@@ -203,6 +209,7 @@ config ALPHA_EIGER
config ALPHA_JENSEN config ALPHA_JENSEN
bool "Jensen" bool "Jensen"
depends on BROKEN depends on BROKEN
select HAVE_EISA
help help
DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
of the first-generation Alpha systems. A number of these systems of the first-generation Alpha systems. A number of these systems
...@@ -219,6 +226,7 @@ config ALPHA_LX164 ...@@ -219,6 +226,7 @@ config ALPHA_LX164
config ALPHA_LYNX config ALPHA_LYNX
bool "Lynx" bool "Lynx"
select HAVE_EISA
help help
AlphaServer 2100A-based systems. AlphaServer 2100A-based systems.
...@@ -229,6 +237,7 @@ config ALPHA_MARVEL ...@@ -229,6 +237,7 @@ config ALPHA_MARVEL
config ALPHA_MIATA config ALPHA_MIATA
bool "Miata" bool "Miata"
select HAVE_EISA
help help
The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a, The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,
or 600au). or 600au).
...@@ -248,6 +257,7 @@ config ALPHA_NONAME_CH ...@@ -248,6 +257,7 @@ config ALPHA_NONAME_CH
config ALPHA_NORITAKE config ALPHA_NORITAKE
bool "Noritake" bool "Noritake"
select HAVE_EISA
help help
AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based
systems. systems.
...@@ -260,6 +270,7 @@ config ALPHA_P2K ...@@ -260,6 +270,7 @@ config ALPHA_P2K
config ALPHA_RAWHIDE config ALPHA_RAWHIDE
bool "Rawhide" bool "Rawhide"
select HAVE_EISA
help help
AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines. AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.
See HOWTO at See HOWTO at
...@@ -279,6 +290,7 @@ config ALPHA_SX164 ...@@ -279,6 +290,7 @@ config ALPHA_SX164
config ALPHA_SABLE config ALPHA_SABLE
bool "Sable" bool "Sable"
select HAVE_EISA
help help
Digital AlphaServer 2000 and 2100-based systems. Digital AlphaServer 2000 and 2100-based systems.
...@@ -319,24 +331,6 @@ config ISA_DMA_API ...@@ -319,24 +331,6 @@ config ISA_DMA_API
bool bool
default y default y
config PCI
bool
depends on !ALPHA_JENSEN
select GENERIC_PCI_IOMAP
default y
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
config PCI_DOMAINS
bool
default y
config PCI_SYSCALL
def_bool PCI
config ALPHA_NONAME config ALPHA_NONAME
bool bool
depends on ALPHA_BOOK1 || ALPHA_NONAME_CH depends on ALPHA_BOOK1 || ALPHA_NONAME_CH
...@@ -526,11 +520,6 @@ config ALPHA_SRM ...@@ -526,11 +520,6 @@ config ALPHA_SRM
If unsure, say N. If unsure, say N.
config EISA
bool
depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
default y
config ARCH_MAY_HAVE_PC_FDC config ARCH_MAY_HAVE_PC_FDC
def_bool y def_bool y
...@@ -681,11 +670,6 @@ config HZ ...@@ -681,11 +670,6 @@ config HZ
default 1200 if HZ_1200 default 1200 if HZ_1200
default 1024 default 1024
source "drivers/pci/Kconfig"
source "drivers/eisa/Kconfig"
source "drivers/pcmcia/Kconfig"
config SRM_ENV config SRM_ENV
tristate "SRM environment through procfs" tristate "SRM environment through procfs"
depends on PROC_FS depends on PROC_FS
......
...@@ -45,14 +45,12 @@ config ARC ...@@ -45,14 +45,12 @@ config ARC
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select OF_RESERVED_MEM select OF_RESERVED_MEM
select PCI_SYSCALL if PCI
select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
config ARCH_HAS_CACHE_LINE_SIZE config ARCH_HAS_CACHE_LINE_SIZE
def_bool y def_bool y
config MIGHT_HAVE_PCI
bool
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
def_bool y def_bool y
...@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER ...@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER
default "12" if ARC_HUGEPAGE_16M default "12" if ARC_HUGEPAGE_16M
default "11" default "11"
menu "Bus Support"
config PCI
bool "PCI support" if MIGHT_HAVE_PCI
help
PCI is the name of a bus system, i.e., the way the CPU talks to
the other stuff inside your box. Find out if your board/platform
has PCI.
Note: PCIe support for Synopsys Device will be available only
when HAPS DX is configured with PCIe RC bitmap. If you have PCI,
say Y, otherwise N.
config PCI_SYSCALL
def_bool PCI
source "drivers/pci/Kconfig"
endmenu
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
...@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X ...@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X
select DW_APB_ICTL select DW_APB_ICTL
select GPIO_DWAPB select GPIO_DWAPB
select OF_GPIO select OF_GPIO
select MIGHT_HAVE_PCI select HAVE_PCI
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select GPIOLIB select GPIOLIB
select AXS101 if ISA_ARCOMPACT select AXS101 if ISA_ARCOMPACT
......
...@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK ...@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK
select ARC_HAS_ACCL_REGS select ARC_HAS_ACCL_REGS
select CLK_HSDK select CLK_HSDK
select RESET_HSDK select RESET_HSDK
select MIGHT_HAVE_PCI select HAVE_PCI
...@@ -104,6 +104,7 @@ config ARM ...@@ -104,6 +104,7 @@ config ARM
select OF_RESERVED_MEM if OF select OF_RESERVED_MEM if OF
select OLD_SIGACTION select OLD_SIGACTION
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
select PCI_SYSCALL if PCI
select PERF_USE_VMALLOC select PERF_USE_VMALLOC
select REFCOUNT_FULL select REFCOUNT_FULL
select RTC_LIB select RTC_LIB
...@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT ...@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT
endif endif
config MIGHT_HAVE_PCI
bool
config SYS_SUPPORTS_APM_EMULATION config SYS_SUPPORTS_APM_EMULATION
bool bool
...@@ -163,21 +161,6 @@ config HAVE_PROC_CPU ...@@ -163,21 +161,6 @@ config HAVE_PROC_CPU
config NO_IOPORT_MAP config NO_IOPORT_MAP
bool bool
config EISA
bool
---help---
The Extended Industry Standard Architecture (EISA) bus was
developed as an open alternative to the IBM MicroChannel bus.
The EISA bus provided some of the features of the IBM MicroChannel
bus while maintaining backward compatibility with cards made for
the older ISA bus. The EISA bus saw limited use between 1988 and
1995 when it was made obsolete by the PCI bus.
Say Y here if you are building a kernel for an EISA-based machine.
Otherwise, say N.
config SBUS config SBUS
bool bool
...@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM ...@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM
select COMMON_CLK select COMMON_CLK
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select MIGHT_HAVE_PCI select HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS_GENERIC if PCI
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
...@@ -407,7 +390,7 @@ config ARCH_IOP13XX ...@@ -407,7 +390,7 @@ config ARCH_IOP13XX
select CPU_XSC3 select CPU_XSC3
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
select VMSPLIT_1G select VMSPLIT_1G
select SPARSE_IRQ select SPARSE_IRQ
...@@ -421,7 +404,7 @@ config ARCH_IOP32X ...@@ -421,7 +404,7 @@ config ARCH_IOP32X
select GPIO_IOP select GPIO_IOP
select GPIOLIB select GPIOLIB
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
help help
Support for Intel's 80219 and IOP32X (XScale) family of Support for Intel's 80219 and IOP32X (XScale) family of
...@@ -434,7 +417,7 @@ config ARCH_IOP33X ...@@ -434,7 +417,7 @@ config ARCH_IOP33X
select GPIO_IOP select GPIO_IOP
select GPIOLIB select GPIOLIB
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PCI select FORCE_PCI
select PLAT_IOP select PLAT_IOP
help help
Support for Intel's IOP33X (XScale) family of processors. Support for Intel's IOP33X (XScale) family of processors.
...@@ -449,7 +432,7 @@ config ARCH_IXP4XX ...@@ -449,7 +432,7 @@ config ARCH_IXP4XX
select DMABOUNCE if PCI select DMABOUNCE if PCI
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIOLIB select GPIOLIB
select MIGHT_HAVE_PCI select HAVE_PCI
select NEED_MACH_IO_H select NEED_MACH_IO_H
select USB_EHCI_BIG_ENDIAN_DESC select USB_EHCI_BIG_ENDIAN_DESC
select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_MMIO
...@@ -462,7 +445,7 @@ config ARCH_DOVE ...@@ -462,7 +445,7 @@ config ARCH_DOVE
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select GPIOLIB select GPIOLIB
select MIGHT_HAVE_PCI select HAVE_PCI
select MVEBU_MBUS select MVEBU_MBUS
select PINCTRL select PINCTRL
select PINCTRL_DOVE select PINCTRL_DOVE
...@@ -1230,46 +1213,18 @@ config ISA_DMA ...@@ -1230,46 +1213,18 @@ config ISA_DMA
config ISA_DMA_API config ISA_DMA_API
bool bool
config PCI
bool "PCI support" if MIGHT_HAVE_PCI
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
config PCI_DOMAINS
bool "Support for multiple PCI domains"
depends on PCI
help
Enable PCI domains kernel management. Say Y if your machine
has a PCI bus hierarchy that requires more than one PCI
domain (aka segment) to be correctly managed. Say N otherwise.
If you don't know what to do here, say N.
config PCI_DOMAINS_GENERIC
def_bool PCI_DOMAINS
config PCI_NANOENGINE config PCI_NANOENGINE
bool "BSE nanoEngine PCI support" bool "BSE nanoEngine PCI support"
depends on SA1100_NANOENGINE depends on SA1100_NANOENGINE
help help
Enable PCI on the BSE nanoEngine board. Enable PCI on the BSE nanoEngine board.
config PCI_SYSCALL
def_bool PCI
config PCI_HOST_ITE8152 config PCI_HOST_ITE8152
bool bool
depends on PCI && MACH_ARMCORE depends on PCI && MACH_ARMCORE
default y default y
select DMABOUNCE select DMABOUNCE
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
endmenu endmenu
menu "Kernel Features" menu "Kernel Features"
......
...@@ -9,7 +9,7 @@ config ARCH_ALPINE ...@@ -9,7 +9,7 @@ config ARCH_ALPINE
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select HAVE_SMP select HAVE_SMP
select MFD_SYSCON select MFD_SYSCON
select PCI select FORCE_PCI
select PCI_HOST_GENERIC select PCI_HOST_GENERIC
help help
This enables support for the Annapurna Labs Alpine V1 boards. This enables support for the Annapurna Labs Alpine V1 boards.
...@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC ...@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC
select GPIOLIB select GPIOLIB
select ARM_AMBA select ARM_AMBA
select PINCTRL select PINCTRL
select PCI_DOMAINS if PCI select PCI_DOMAINS_GENERIC if PCI
help help
This enables support for systems based on Broadcom IPROC architected SoCs. This enables support for systems based on Broadcom IPROC architected SoCs.
The IPROC complex contains one or more ARM CPUs along with common The IPROC complex contains one or more ARM CPUs along with common
......
...@@ -9,7 +9,7 @@ config ARCH_CATS ...@@ -9,7 +9,7 @@ config ARCH_CATS
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the CATS. Say Y here if you intend to run this kernel on the CATS.
...@@ -20,7 +20,7 @@ config ARCH_PERSONAL_SERVER ...@@ -20,7 +20,7 @@ config ARCH_PERSONAL_SERVER
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
---help--- ---help---
Say Y here if you intend to run this kernel on the Compaq Say Y here if you intend to run this kernel on the Compaq
Personal Server. Personal Server.
...@@ -53,7 +53,7 @@ config ARCH_EBSA285_HOST ...@@ -53,7 +53,7 @@ config ARCH_EBSA285_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select ARCH_MAY_HAVE_PC_FDC select ARCH_MAY_HAVE_PC_FDC
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the EBSA285 card Say Y here if you intend to run this kernel on the EBSA285 card
in host ("central function") mode. in host ("central function") mode.
...@@ -67,7 +67,7 @@ config ARCH_NETWINDER ...@@ -67,7 +67,7 @@ config ARCH_NETWINDER
select FOOTBRIDGE_HOST select FOOTBRIDGE_HOST
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select FORCE_PCI
help help
Say Y here if you intend to run this kernel on the Rebel.COM Say Y here if you intend to run this kernel on the Rebel.COM
NetWinder. Information about this machine can be found at: NetWinder. Information about this machine can be found at:
......
...@@ -7,7 +7,7 @@ comment "IXP4xx Platforms" ...@@ -7,7 +7,7 @@ comment "IXP4xx Platforms"
config MACH_NSLU2 config MACH_NSLU2
bool bool
prompt "Linksys NSLU2" prompt "Linksys NSLU2"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Linksys's Say 'Y' here if you want your kernel to support Linksys's
NSLU2 NAS device. For more information on this platform, NSLU2 NAS device. For more information on this platform,
...@@ -15,7 +15,7 @@ config MACH_NSLU2 ...@@ -15,7 +15,7 @@ config MACH_NSLU2
config MACH_AVILA config MACH_AVILA
bool "Avila" bool "Avila"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the Gateworks Say 'Y' here if you want your kernel to support the Gateworks
Avila Network Platform. For more information on this platform, Avila Network Platform. For more information on this platform,
...@@ -31,7 +31,7 @@ config MACH_LOFT ...@@ -31,7 +31,7 @@ config MACH_LOFT
config ARCH_ADI_COYOTE config ARCH_ADI_COYOTE
bool "Coyote" bool "Coyote"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the ADI Say 'Y' here if you want your kernel to support the ADI
Engineering Coyote Gateway Reference Platform. For more Engineering Coyote Gateway Reference Platform. For more
...@@ -39,7 +39,7 @@ config ARCH_ADI_COYOTE ...@@ -39,7 +39,7 @@ config ARCH_ADI_COYOTE
config MACH_GATEWAY7001 config MACH_GATEWAY7001
bool "Gateway 7001" bool "Gateway 7001"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Gateway's Say 'Y' here if you want your kernel to support Gateway's
7001 Access Point. For more information on this platform, 7001 Access Point. For more information on this platform,
...@@ -47,7 +47,7 @@ config MACH_GATEWAY7001 ...@@ -47,7 +47,7 @@ config MACH_GATEWAY7001
config MACH_WG302V2 config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2" bool "Netgear WG302 v2 / WAG302 v2"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Netgear's Say 'Y' here if you want your kernel to support Netgear's
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
...@@ -107,7 +107,7 @@ config ARCH_PRPMC1100 ...@@ -107,7 +107,7 @@ config ARCH_PRPMC1100
config MACH_NAS100D config MACH_NAS100D
bool bool
prompt "NAS100D" prompt "NAS100D"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Iomega's Say 'Y' here if you want your kernel to support Iomega's
NAS 100d device. For more information on this platform, NAS 100d device. For more information on this platform,
...@@ -116,7 +116,7 @@ config MACH_NAS100D ...@@ -116,7 +116,7 @@ config MACH_NAS100D
config MACH_DSMG600 config MACH_DSMG600
bool bool
prompt "D-Link DSM-G600 RevA" prompt "D-Link DSM-G600 RevA"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support D-Link's Say 'Y' here if you want your kernel to support D-Link's
DSM-G600 RevA device. For more information on this platform, DSM-G600 RevA device. For more information on this platform,
...@@ -130,7 +130,7 @@ config ARCH_IXDP4XX ...@@ -130,7 +130,7 @@ config ARCH_IXDP4XX
config MACH_FSG config MACH_FSG
bool bool
prompt "Freecom FSG-3" prompt "Freecom FSG-3"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Freecom's Say 'Y' here if you want your kernel to support Freecom's
FSG-3 device. For more information on this platform, FSG-3 device. For more information on this platform,
...@@ -139,7 +139,7 @@ config MACH_FSG ...@@ -139,7 +139,7 @@ config MACH_FSG
config MACH_ARCOM_VULCAN config MACH_ARCOM_VULCAN
bool bool
prompt "Arcom/Eurotech Vulcan" prompt "Arcom/Eurotech Vulcan"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support Arcom's Say 'Y' here if you want your kernel to support Arcom's
Vulcan board. Vulcan board.
...@@ -160,7 +160,7 @@ config CPU_IXP43X ...@@ -160,7 +160,7 @@ config CPU_IXP43X
config MACH_GTWX5715 config MACH_GTWX5715
bool "Gemtek WX5715 (Linksys WRV54G)" bool "Gemtek WX5715 (Linksys WRV54G)"
depends on ARCH_IXP4XX depends on ARCH_IXP4XX
select PCI select FORCE_PCI
help help
This board is currently inside the Linksys WRV54G Gateways. This board is currently inside the Linksys WRV54G Gateways.
...@@ -183,7 +183,7 @@ config MACH_DEVIXP ...@@ -183,7 +183,7 @@ config MACH_DEVIXP
config MACH_MICCPT config MACH_MICCPT
bool "Omicron MICCPT" bool "Omicron MICCPT"
select PCI select FORCE_PCI
help help
Say 'Y' here if you want your kernel to support the MICCPT Say 'Y' here if you want your kernel to support the MICCPT
board from OMICRON electronics GmbH. board from OMICRON electronics GmbH.
......
...@@ -4,7 +4,7 @@ menu "Kendin/Micrel KS8695 Implementations" ...@@ -4,7 +4,7 @@ menu "Kendin/Micrel KS8695 Implementations"
config MACH_KS8695 config MACH_KS8695
bool "KS8695 development board" bool "KS8695 development board"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to run on the original Say 'Y' here if you want your kernel to run on the original
Kendin-Micrel KS8695 development board. Kendin-Micrel KS8695 development board.
...@@ -52,7 +52,7 @@ config MACH_CM4002 ...@@ -52,7 +52,7 @@ config MACH_CM4002
config MACH_CM4008 config MACH_CM4008
bool "OpenGear CM4008" bool "OpenGear CM4008"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
CM4008 Console Server. See http://www.opengear.com for more CM4008 Console Server. See http://www.opengear.com for more
...@@ -60,7 +60,7 @@ config MACH_CM4008 ...@@ -60,7 +60,7 @@ config MACH_CM4008
config MACH_CM41xx config MACH_CM41xx
bool "OpenGear CM41xx" bool "OpenGear CM41xx"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
CM4016 or CM4048 Console Servers. See http://www.opengear.com for CM4016 or CM4048 Console Servers. See http://www.opengear.com for
...@@ -68,7 +68,7 @@ config MACH_CM41xx ...@@ -68,7 +68,7 @@ config MACH_CM41xx
config MACH_IM4004 config MACH_IM4004
bool "OpenGear IM4004" bool "OpenGear IM4004"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
IM4004 Secure Access Server. See http://www.opengear.com for IM4004 Secure Access Server. See http://www.opengear.com for
...@@ -76,7 +76,7 @@ config MACH_IM4004 ...@@ -76,7 +76,7 @@ config MACH_IM4004
config MACH_IM42xx config MACH_IM42xx
bool "OpenGear IM42xx" bool "OpenGear IM42xx"
select MIGHT_HAVE_PCI select HAVE_PCI
help help
Say 'Y' here if you want your kernel to support the OpenGear Say 'Y' here if you want your kernel to support the OpenGear
IM4216 or IM4248 Console Servers. See http://www.opengear.com for IM4216 or IM4248 Console Servers. See http://www.opengear.com for
......
...@@ -4,7 +4,7 @@ menuconfig ARCH_MV78XX0 ...@@ -4,7 +4,7 @@ menuconfig ARCH_MV78XX0
select CPU_FEROCEON select CPU_FEROCEON
select GPIOLIB select GPIOLIB
select MVEBU_MBUS select MVEBU_MBUS
select PCI select FORCE_PCI
select PLAT_ORION_LEGACY select PLAT_ORION_LEGACY
help help
Support for the following Marvell MV78xx0 series SoCs: Support for the following Marvell MV78xx0 series SoCs:
......
...@@ -124,7 +124,7 @@ config MACH_KIRKWOOD ...@@ -124,7 +124,7 @@ config MACH_KIRKWOOD
select MACH_MVEBU_ANY select MACH_MVEBU_ANY
select ORION_IRQCHIP select ORION_IRQCHIP
select ORION_TIMER select ORION_TIMER
select PCI select FORCE_PCI
select PCI_QUIRKS