diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-cns3xxx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ks8695/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/Kconfig | 1 |
6 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0e51342b3c02..7e94f8609c87 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -34,6 +34,9 @@ config ARM | |||
| 34 | config HAVE_PWM | 34 | config HAVE_PWM |
| 35 | bool | 35 | bool |
| 36 | 36 | ||
| 37 | config MIGHT_HAVE_PCI | ||
| 38 | bool | ||
| 39 | |||
| 37 | config SYS_SUPPORTS_APM_EMULATION | 40 | config SYS_SUPPORTS_APM_EMULATION |
| 38 | bool | 41 | bool |
| 39 | 42 | ||
| @@ -298,6 +301,7 @@ config ARCH_CNS3XXX | |||
| 298 | select CPU_V6 | 301 | select CPU_V6 |
| 299 | select GENERIC_CLOCKEVENTS | 302 | select GENERIC_CLOCKEVENTS |
| 300 | select ARM_GIC | 303 | select ARM_GIC |
| 304 | select MIGHT_HAVE_PCI | ||
| 301 | select PCI_DOMAINS if PCI | 305 | select PCI_DOMAINS if PCI |
| 302 | help | 306 | help |
| 303 | Support for Cavium Networks CNS3XXX platform. | 307 | Support for Cavium Networks CNS3XXX platform. |
| @@ -433,6 +437,7 @@ config ARCH_IXP4XX | |||
| 433 | select CPU_XSCALE | 437 | select CPU_XSCALE |
| 434 | select GENERIC_GPIO | 438 | select GENERIC_GPIO |
| 435 | select GENERIC_CLOCKEVENTS | 439 | select GENERIC_CLOCKEVENTS |
| 440 | select MIGHT_HAVE_PCI | ||
| 436 | select DMABOUNCE if PCI | 441 | select DMABOUNCE if PCI |
| 437 | help | 442 | help |
| 438 | Support for Intel's IXP4XX (XScale) family of processors. | 443 | Support for Intel's IXP4XX (XScale) family of processors. |
| @@ -1164,7 +1169,7 @@ config ISA_DMA_API | |||
| 1164 | bool | 1169 | bool |
| 1165 | 1170 | ||
| 1166 | config PCI | 1171 | config PCI |
| 1167 | bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX | 1172 | bool "PCI support" if MIGHT_HAVE_PCI |
| 1168 | help | 1173 | help |
| 1169 | Find out whether you have a PCI motherboard. PCI is the name of a | 1174 | Find out whether you have a PCI motherboard. PCI is the name of a |
| 1170 | bus system, i.e. the way the CPU talks to the other stuff inside | 1175 | bus system, i.e. the way the CPU talks to the other stuff inside |
diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index 9ebfcc46feb1..29b13f249aa9 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig | |||
| @@ -3,6 +3,7 @@ menu "CNS3XXX platform type" | |||
| 3 | 3 | ||
| 4 | config MACH_CNS3420VB | 4 | config MACH_CNS3420VB |
| 5 | bool "Support for CNS3420 Validation Board" | 5 | bool "Support for CNS3420 Validation Board" |
| 6 | select MIGHT_HAVE_PCI | ||
| 6 | help | 7 | help |
| 7 | Include support for the Cavium Networks CNS3420 MPCore Platform | 8 | Include support for the Cavium Networks CNS3420 MPCore Platform |
| 8 | Baseboard. | 9 | Baseboard. |
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 27db275b367c..769b0f10c834 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "Integrator Options" | |||
| 4 | 4 | ||
| 5 | config ARCH_INTEGRATOR_AP | 5 | config ARCH_INTEGRATOR_AP |
| 6 | bool "Support Integrator/AP and Integrator/PP2 platforms" | 6 | bool "Support Integrator/AP and Integrator/PP2 platforms" |
| 7 | select MIGHT_HAVE_PCI | ||
| 7 | help | 8 | help |
| 8 | Include support for the ARM(R) Integrator/AP and | 9 | Include support for the ARM(R) Integrator/AP and |
| 9 | Integrator/PP2 platforms. | 10 | Integrator/PP2 platforms. |
diff --git a/arch/arm/mach-ks8695/Kconfig b/arch/arm/mach-ks8695/Kconfig index fe0c82e30b2d..f5c39a8c2b00 100644 --- a/arch/arm/mach-ks8695/Kconfig +++ b/arch/arm/mach-ks8695/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "Kendin/Micrel KS8695 Implementations" | |||
| 4 | 4 | ||
| 5 | config MACH_KS8695 | 5 | config MACH_KS8695 |
| 6 | bool "KS8695 development board" | 6 | bool "KS8695 development board" |
| 7 | select MIGHT_HAVE_PCI | ||
| 7 | help | 8 | help |
| 8 | Say 'Y' here if you want your kernel to run on the original | 9 | Say 'Y' here if you want your kernel to run on the original |
| 9 | Kendin-Micrel KS8695 development board. | 10 | Kendin-Micrel KS8695 development board. |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index dd235ecc9d6c..716a2e159c2c 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -94,6 +94,7 @@ config MACH_ARMCORE | |||
| 94 | select PXA27x | 94 | select PXA27x |
| 95 | select IWMMXT | 95 | select IWMMXT |
| 96 | select PXA25x | 96 | select PXA25x |
| 97 | select MIGHT_HAVE_PCI | ||
| 97 | 98 | ||
| 98 | config MACH_EM_X270 | 99 | config MACH_EM_X270 |
| 99 | bool "CompuLab EM-x270 platform" | 100 | bool "CompuLab EM-x270 platform" |
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index c781f30c8368..3f7b5e9d83c5 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "Versatile platform type" | |||
| 4 | config ARCH_VERSATILE_PB | 4 | config ARCH_VERSATILE_PB |
| 5 | bool "Support Versatile/PB platform" | 5 | bool "Support Versatile/PB platform" |
| 6 | select CPU_ARM926T | 6 | select CPU_ARM926T |
| 7 | select MIGHT_HAVE_PCI | ||
| 7 | default y | 8 | default y |
| 8 | help | 9 | help |
| 9 | Include support for the ARM(R) Versatile/PB platform. | 10 | Include support for the ARM(R) Versatile/PB platform. |
