Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6-omap-h63xx.git] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 6c8452ede0e113c4c50c6a29620ba7adbb9391db..09c93ff932b15453d316df1d12b7844697d9ca22 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -5,10 +5,9 @@
 # Parport configuration.
 #
 
 # Parport configuration.
 #
 

-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT

        tristate "Parallel port support"
        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
        ---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 unsure, say Y.
 

+if PARPORT
+

 config PARPORT_PC
        tristate "PC-style hardware"
 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
        ---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,17 +83,9 @@ config PARPORT_PC_PCMCIA
          Say Y here if you need PCMCIA support for your PC-style parallel
          ports. If unsure, say N.
 
          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_ARC
-       tristate "Archimedes hardware"
-       depends on ARM && PARPORT
-       select PARPORT_NOT_PC
-

 config PARPORT_IP32
        tristate "SGI IP32 builtin port (EXPERIMENTAL)"
 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
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port on


@@ -101,7 +94,7 @@ config PARPORT_IP32
 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"
 
 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
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port hardware on


@@ -110,7 +103,7 @@ config PARPORT_AMIGA
 
 config PARPORT_MFC3
        tristate "Multiface III parallel port"
 
 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.
        select PARPORT_NOT_PC
        help
          Say Y here if you need parallel port support for the MFC3 card.


@@ -119,7 +112,7 @@ config PARPORT_MFC3
 
 config PARPORT_ATARI
        tristate "Atari hardware"
 
 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
        select PARPORT_NOT_PC
        help
          Say Y here if you need support for the parallel port hardware on


@@ -129,21 +122,30 @@ config PARPORT_ATARI
 config PARPORT_GSC
        tristate
        default GSC
 config PARPORT_GSC
        tristate
        default GSC

-       depends on PARPORT

        select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"
        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
          found on many Sun machines. Note that many of the newer Ultras
          actually have pc style hardware instead.
 
        select PARPORT_NOT_PC
        help
          This driver provides support for the bidirectional parallel port
          found on many Sun machines. Note that many of the newer Ultras
          actually have pc style hardware instead.
 

+config PARPORT_AX88796
+       tristate "AX88796 Parallel Port"
+       select PARPORT_NOT_PC
+       help
+         Say Y here if you need support for the parallel port hardware on
+         the AX88796 network controller chip. This code is also available
+         as a module (say M), called parport_ax88796.
+
+         The driver is not dependant on the AX88796 network driver, and
+         should not interfere with the networking functions of the chip.
+

 config PARPORT_1284
        bool "IEEE 1284 transfer modes"
 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
        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


@@ -151,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.
 
          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