eisa: consolidate EISA Kconfig entry in drivers/eisa

[linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 50bc6785743231837583a337b47597ab6043fcd2..7b1dfaec030eefb201308c6fb17d4eac95041bb6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -103,6 +103,7 @@ config ARM
        select OF_RESERVED_MEM if OF
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
+       select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC
        select REFCOUNT_FULL
        select RTC_LIB
@@ -160,21 +161,6 @@ config HAVE_PROC_CPU
 config NO_IOPORT_MAP
        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
        bool
 
@@ -331,7 +317,7 @@ config ARCH_MULTIPLATFORM
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_MULTI_HANDLER
        select HAVE_PCI
-       select PCI_DOMAINS if PCI
+       select PCI_DOMAINS_GENERIC if PCI
        select SPARSE_IRQ
        select USE_OF
 
@@ -1227,36 +1213,18 @@ config ISA_DMA
 config ISA_DMA_API
        bool
 
-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
        bool "BSE nanoEngine PCI support"
        depends on SA1100_NANOENGINE
        help
          Enable PCI on the BSE nanoEngine board.
 
-config PCI_SYSCALL
-       def_bool PCI
-
 config PCI_HOST_ITE8152
        bool
        depends on PCI && MACH_ARMCORE
        default y
        select DMABOUNCE
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "Kernel Features"