Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 6c8452e..c7fa28a 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -85,11 +85,6 @@ config PARPORT_PC_PCMCIA
 config PARPORT_NOT_PC
        bool
 
 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)"
        depends on SGI_IP32 && PARPORT && EXPERIMENTAL
 config PARPORT_IP32
        tristate "SGI IP32 builtin port (EXPERIMENTAL)"
        depends on SGI_IP32 && PARPORT && EXPERIMENTAL


@@ -141,6 +136,18 @@ config PARPORT_SUNBPP
          found on many Sun machines. Note that many of the newer Ultras
          actually have pc style hardware instead.
 
          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"
+       depends on PARPORT
+       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"
        depends on PARPORT
 config PARPORT_1284
        bool "IEEE 1284 transfer modes"
        depends on PARPORT