diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-22 19:00:55 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-22 19:00:55 +0400 |
| commit | cb86ae95a0168be2acc6c48b1671ffaba1e5e39e (patch) | |
| tree | 4eb05040fcb450d24817294050536d328588c7d9 /arch/arm/Kconfig | |
| parent | 14764b01a5576ce23a9d0c95a027049206a19cef (diff) | |
| parent | 23f5cace4f858ddf40eb0ee77b984d329fd23518 (diff) | |
| download | linux-cb86ae95a0168be2acc6c48b1671ffaba1e5e39e.tar.xz | |
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 44b6d9b42483..c1e0cdfd1147 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -301,6 +301,7 @@ config ARCH_CNS3XXX select CPU_V6 select GENERIC_CLOCKEVENTS select ARM_GIC + select PCI_DOMAINS if PCI help Support for Cavium Networks CNS3XXX platform. @@ -1061,7 +1062,7 @@ config ISA_DMA_API bool config PCI - bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE + bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX 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 |