Commit eb01d42a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada

PCI: consolidate PCI config entry in drivers/pci

There is no good reason to duplicate the PCI menu in every architecture.
Instead provide a selectable HAVE_PCI symbol that indicates availability
of PCI support, and a FORCE_PCI symbol to for PCI on and the handle the
rest in drivers/pci.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 437f2b8c
...@@ -6,6 +6,7 @@ config ALPHA ...@@ -6,6 +6,7 @@ config ALPHA
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
select ARCH_NO_PREEMPT select ARCH_NO_PREEMPT
select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_CMPXCHG_LOCKREF
select FORCE_PCI if !ALPHA_JENSEN
select HAVE_AOUT select HAVE_AOUT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
...@@ -15,6 +16,7 @@ config ALPHA ...@@ -15,6 +16,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
...@@ -319,17 +321,6 @@ config ISA_DMA_API ...@@ -319,17 +321,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 config PCI_DOMAINS
bool bool
default y default y
...@@ -681,7 +672,6 @@ config HZ ...@@ -681,7 +672,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/eisa/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -51,9 +51,6 @@ config ARC ...@@ -51,9 +51,6 @@ config ARC
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
...@@ -553,24 +550,7 @@ config FORCE_MAX_ZONEORDER ...@@ -553,24 +550,7 @@ 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 config PCI_SYSCALL
def_bool PCI 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
...@@ -147,9 +147,6 @@ config ARM_DMA_IOMMU_ALIGNMENT ...@@ -147,9 +147,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
...@@ -333,7 +330,7 @@ config ARCH_MULTIPLATFORM ...@@ -333,7 +330,7 @@ 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 if PCI
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
...@@ -407,7 +404,7 @@ config ARCH_IOP13XX ...@@ -407,7 +404,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 +418,7 @@ config ARCH_IOP32X ...@@ -421,7 +418,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 +431,7 @@ config ARCH_IOP33X ...@@ -434,7 +431,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 +446,7 @@ config ARCH_IXP4XX ...@@ -449,7 +446,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 +459,7 @@ config ARCH_DOVE ...@@ -462,7 +459,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,14 +1227,6 @@ config ISA_DMA ...@@ -1230,14 +1227,6 @@ 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 config PCI_DOMAINS
bool "Support for multiple PCI domains" bool "Support for multiple PCI domains"
depends on PCI depends on PCI
...@@ -1266,8 +1255,6 @@ config PCI_HOST_ITE8152 ...@@ -1266,8 +1255,6 @@ config PCI_HOST_ITE8152
default y default y
select DMABOUNCE select DMABOUNCE
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -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.
...@@ -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 select PCI_QUIRKS
select PINCTRL_KIRKWOOD select PINCTRL_KIRKWOOD
help help
......
...@@ -5,7 +5,7 @@ menuconfig ARCH_ORION5X ...@@ -5,7 +5,7 @@ menuconfig ARCH_ORION5X
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIOLIB select GPIOLIB
select MVEBU_MBUS select MVEBU_MBUS
select PCI select FORCE_PCI
select PHYLIB if NETDEVICES select PHYLIB if NETDEVICES
select PLAT_ORION_LEGACY select PLAT_ORION_LEGACY
help help
......
...@@ -125,7 +125,7 @@ config MACH_ARMCORE ...@@ -125,7 +125,7 @@ config MACH_ARMCORE
bool "CompuLab CM-X255/CM-X270 modules" bool "CompuLab CM-X255/CM-X270 modules"
select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
select IWMMXT select IWMMXT
select MIGHT_HAVE_PCI select HAVE_PCI
select NEED_MACH_IO_H if PCI select NEED_MACH_IO_H if PCI
select PXA25x select PXA25x
select PXA27x select PXA27x
......
...@@ -120,7 +120,7 @@ config SA1100_LART ...@@ -120,7 +120,7 @@ config SA1100_LART
config SA1100_NANOENGINE config SA1100_NANOENGINE
bool "nanoEngine" bool "nanoEngine"
select ARM_SA1110_CPUFREQ select ARM_SA1110_CPUFREQ
select PCI select FORCE_PCI
select PCI_NANOENGINE select PCI_NANOENGINE
help help
Say Y here if you are using the Bright Star Engineering nanoEngine. Say Y here if you are using the Bright Star Engineering nanoEngine.
......
...@@ -103,6 +103,7 @@ config ARM64 ...@@ -103,6 +103,7 @@ config ARM64
select GENERIC_TIME_VSYSCALL select GENERIC_TIME_VSYSCALL
select HANDLE_DOMAIN_IRQ select HANDLE_DOMAIN_IRQ
select HARDIRQS_SW_RESEND select HARDIRQS_SW_RESEND
select HAVE_PCI
select HAVE_ACPI_APEI if (ACPI && EFI) select HAVE_ACPI_APEI if (ACPI && EFI)
select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ALIGNED_STRUCT_PAGE if SLUB
select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_AUDITSYSCALL
...@@ -287,15 +288,6 @@ config ARCH_PROC_KCORE_TEXT ...@@ -287,15 +288,6 @@ config ARCH_PROC_KCORE_TEXT
source "arch/arm64/Kconfig.platforms" source "arch/arm64/Kconfig.platforms"
menu "Bus support"
config PCI
bool "PCI support"
help
This feature enables support for PCI bus system. If you say Y
here, the kernel will include drivers and infrastructure code
to support PCI bus devices.
config PCI_DOMAINS config PCI_DOMAINS
def_bool PCI def_bool PCI
...@@ -305,10 +297,6 @@ config PCI_DOMAINS_GENERIC ...@@ -305,10 +297,6 @@ config PCI_DOMAINS_GENERIC
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig"
endmenu
menu "Kernel Features" menu "Kernel Features"
menu "ARM errata workarounds via the alternatives framework" menu "ARM errata workarounds via the alternatives framework"
......
...@@ -47,9 +47,6 @@ config FRAME_POINTER ...@@ -47,9 +47,6 @@ config FRAME_POINTER
config LOCKDEP_SUPPORT config LOCKDEP_SUPPORT
def_bool y def_bool y
config PCI
def_bool n
config EARLY_PRINTK config EARLY_PRINTK
def_bool y def_bool y
......
...@@ -10,11 +10,11 @@ config IA64 ...@@ -10,11 +10,11 @@ config IA64
bool bool
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
select PCI if (!IA64_HP_SIM)
select ACPI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM)
select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM) select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)
select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select FORCE_PCI if (!IA64_HP_SIM)
select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
select HAVE_IDE select HAVE_IDE
...@@ -544,20 +544,12 @@ if !IA64_HP_SIM ...@@ -544,20 +544,12 @@ if !IA64_HP_SIM
menu "Bus options (PCI, PCMCIA)" menu "Bus options (PCI, PCMCIA)"
config PCI
bool "PCI support"
help
Real IA-64 machines all have PCI/PCI-X/PCI Express busses. Say Y
here unless you are using a simulator without PCI support.
config PCI_DOMAINS config PCI_DOMAINS
def_bool PCI def_bool PCI
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
endmenu endmenu
......
...@@ -63,17 +63,6 @@ source "drivers/zorro/Kconfig" ...@@ -63,17 +63,6 @@ source "drivers/zorro/Kconfig"
endif endif
config PCI
bool "PCI support"
depends on M54xx
help
Enable the PCI bus. Support for the PCI bus hardware built into the
ColdFire 547x and 548x processors.
if PCI
source "drivers/pci/Kconfig"
endif
if !MMU if !MMU
config ISA_DMA_API config ISA_DMA_API
......
...@@ -299,6 +299,7 @@ config M53xx ...@@ -299,6 +299,7 @@ config M53xx
bool bool
config M54xx config M54xx
select HAVE_PCI
bool bool
endif # COLDFIRE endif # COLDFIRE
......
...@@ -30,6 +30,7 @@ config MICROBLAZE ...@@ -30,6 +30,7 @@ config MICROBLAZE
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_NODE_MAP
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_PCI
select IRQ_DOMAIN select IRQ_DOMAIN
select XILINX_INTC select XILINX_INTC