Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-microblaze.git] / drivers / parisc / Kconfig

diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 5a48b56..74e119a 100644 (file)
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -2,6 +2,7 @@ menu "Bus options (PCI, PCMCIA, EISA, GSC, ISA)"
 
 config GSC
        bool "VSC/GSC/HSC bus support"
+       select HAVE_EISA
        default y
        help
          The VSC, GSC and HSC busses were used from the earliest 700-series
@@ -46,16 +47,6 @@ config GSC_WAX
          used), a HIL interface chip and is also known to be used as the
          GSC bridge for an X.25 GSC card.
 
-config EISA
-       bool "EISA support"
-       depends on GSC
-       help
-         Say Y here if you have an EISA bus in your machine.  This code
-         supports both the Mongoose & Wax EISA adapters.  It is sadly
-         incomplete and lacks support for card-to-host DMA.
-
-source "drivers/eisa/Kconfig"
-
 config ISA
        bool "ISA support"
        depends on EISA
@@ -63,17 +54,6 @@ config ISA
          If you want to plug an ISA card into your EISA bus, say Y here.
          Most people should say N.
 
-config PCI
-       bool "PCI support"
-       help
-         All recent HP machines have PCI slots, and you should say Y here
-         if you have a recent machine.  If you are convinced you do not have
-         PCI slots in your machine (eg a 712), then you may say "N" here.
-         Beware that some GSC cards have a Dino onboard and PCI inside them,
-         so it may be safest to say "Y" anyway.
-
-source "drivers/pci/Kconfig"
-
 config GSC_DINO
        bool "GSCtoPCI/Dino PCI support"
        depends on PCI && GSC
@@ -103,8 +83,6 @@ config IOMMU_SBA
        depends on PCI_LBA
        default PCI_LBA
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "PA-RISC specific drivers"