Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[sfrench/cifs-2.6.git] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index c7fa28a28b9f0b3dc31ec0f1afefc21c05654c22..09c93ff932b15453d316df1d12b7844697d9ca22 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -5,10 +5,9 @@
 # Parport configuration.
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
        tristate "Parallel port support"
+       depends on HAS_IOMEM
        ---help---
          If you want to use devices connected to your machine's parallel port
          (the connector at the computer with 25 holes), e.g. printer, ZIP
@@ -32,9 +31,11 @@ config PARPORT
 
          If unsure, say Y.
 
+if PARPORT
+
 config PARPORT_PC
        tristate "PC-style hardware"
-       depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
+       depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
        ---help---
          You should say Y here if you have a PC-style parallel port. All
          IBM PC compatible computers and some Alphas have PC-style
@@ -82,12 +83,9 @@ config PARPORT_PC_PCMCIA
          Say Y here if you need PCMCIA support for your PC-style parallel
          ports. If unsure, say N.
 
-config PARPORT_NOT_PC
-       bool
-
 config PARPORT_IP32
        tristate "SGI IP32 builtin port (EXPERIMENTAL)"
-       depends on SGI_IP32 && PARPORT && EXPERIMENTAL
+       depends on SGI_IP32 && EXPERIMENTAL
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port on
@@ -96,7 +94,7 @@ config PARPORT_IP32
 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"
-       depends on AMIGA && PARPORT
+       depends on AMIGA
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port hardware on
@@ -105,7 +103,7 @@ config PARPORT_AMIGA
 
 config PARPORT_MFC3
        tristate "Multiface III parallel port"
-       depends on ZORRO && PARPORT
+       depends on ZORRO
        select PARPORT_NOT_PC
        help
          Say Y here if you need parallel port support for the MFC3 card.
@@ -114,7 +112,7 @@ config PARPORT_MFC3
 
 config PARPORT_ATARI
        tristate "Atari hardware"
-       depends on ATARI && PARPORT
+       depends on ATARI
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port hardware on
@@ -124,12 +122,11 @@ config PARPORT_ATARI
 config PARPORT_GSC
        tristate
        default GSC
-       depends on PARPORT
        select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"
-       depends on SBUS && PARPORT && EXPERIMENTAL
+       depends on SBUS && EXPERIMENTAL
        select PARPORT_NOT_PC
        help
          This driver provides support for the bidirectional parallel port
@@ -138,7 +135,6 @@ config PARPORT_SUNBPP
 
 config PARPORT_AX88796
        tristate "AX88796 Parallel Port"
-       depends on PARPORT
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port hardware on
@@ -150,7 +146,6 @@ config PARPORT_AX88796
 
 config PARPORT_1284
        bool "IEEE 1284 transfer modes"
-       depends on PARPORT
        help
          If you have a printer that supports status readback or device ID, or
          want to use a device that uses enhanced parallel port transfer modes
@@ -158,5 +153,7 @@ config PARPORT_1284
          transfer modes. Also say Y if you want device ID information to
          appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
 
-endmenu
+config PARPORT_NOT_PC
+       bool
 
+endif # PARPORT