[Bluetooth] Add platform device for virtual and serial devices

[~andy/linux] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index f605dea57224ca23e5f1159c670f554104de1c21..c7fa28a28b9f0b3dc31ec0f1afefc21c05654c22 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -48,7 +48,7 @@ config PARPORT_PC
 
 config PARPORT_SERIAL
        tristate "Multi-IO cards (parallel and serial)"
 
 config PARPORT_SERIAL
        tristate "Multi-IO cards (parallel and serial)"

-       depends on SERIAL_8250 && PARPORT_PC && PCI
+       depends on SERIAL_8250_PCI && PARPORT_PC && PCI

        help
          This adds support for multi-IO PCI cards that have parallel and
          serial ports.  You should say Y or M here.  If you say M, the module
        help
          This adds support for multi-IO PCI cards that have parallel and
          serial ports.  You should say Y or M here.  If you say M, the module


@@ -85,10 +85,14 @@ config PARPORT_PC_PCMCIA
 config PARPORT_NOT_PC
        bool
 
 config PARPORT_NOT_PC
        bool
 

-config PARPORT_ARC
-       tristate "Archimedes hardware"
-       depends on ARM && PARPORT
+config PARPORT_IP32
+       tristate "SGI IP32 builtin port (EXPERIMENTAL)"
+       depends on SGI_IP32 && PARPORT && EXPERIMENTAL

        select PARPORT_NOT_PC
        select PARPORT_NOT_PC

+       help
+         Say Y here if you need support for the parallel port on
+         SGI O2 machines. This code is also available as a module (say M),
+         called parport_ip32.  If in doubt, saying N is the safe plan.

 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"
 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"


@@ -132,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