eeprom_93cx6: shorten pulse timing to match spec (bis)

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

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index e7d56573fe5627fcd4c35b13d1d4f973b6248d09..8012b3b0ce75b83c23ae81f872fadb645167e3f1 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -1,11 +1,11 @@
-# -*- shell-script -*-
-

 menu "IEEE 1394 (FireWire) support"
 menu "IEEE 1394 (FireWire) support"

+       depends on PCI || BROKEN
+
+source "drivers/firewire/Kconfig"

 
 config IEEE1394
        tristate "IEEE 1394 (FireWire) support"
        depends on PCI || BROKEN
 
 config IEEE1394
        tristate "IEEE 1394 (FireWire) support"
        depends on PCI || BROKEN

-       select NET

        help
          IEEE 1394 describes a high performance serial bus, which is also
          known as FireWire(tm) or i.Link(tm) and is used for connecting all
        help
          IEEE 1394 describes a high performance serial bus, which is also
          known as FireWire(tm) or i.Link(tm) and is used for connecting all


@@ -35,45 +35,7 @@ config IEEE1394_VERBOSEDEBUG
          Say Y if you really want or need the debugging output, everyone
          else says N.
 
          Say Y if you really want or need the debugging output, everyone
          else says N.
 

-config IEEE1394_OUI_DB
-       bool "OUI Database built-in (deprecated)"
-       depends on IEEE1394
-       help
-         If you say Y here, then an OUI list (vendor unique ID's) will be
-         compiled into the ieee1394 module. This doesn't really do much
-         except being able to display the vendor of a hardware node. The
-         downside is that it adds about 300k to the size of the module,
-         or kernel (depending on whether you compile ieee1394 as a
-         module, or static in the kernel).
-
-         This option is not needed for userspace programs like gscanbus
-         to show this information.
-
-config IEEE1394_EXTRA_CONFIG_ROMS
-       bool "Build in extra config rom entries for certain functionality"
-       depends on IEEE1394
-       help
-         Some IEEE1394 functionality depends on extra config rom entries
-         being available in the host adapters CSR. These options will
-         allow you to choose which ones.
-
-config IEEE1394_CONFIG_ROM_IP1394
-       bool "IP-1394 Entry"
-       depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394
-       help
-         Adds an entry for using IP-over-1394. If you want to use your
-         IEEE1394 bus as a network for IP systems (including interacting
-         with MacOSX and WinXP IP-over-1394), enable this option and the
-         eth1394 option below.
-
-config IEEE1394_EXPORT_FULL_API
-       bool "Export all symbols of ieee1394's API (deprecated)"
-       depends on IEEE1394
-       default n
-       help
-         This option will be removed soon.  Don't worry, say N.
-
-comment "Device Drivers"
+comment "Controllers"

        depends on IEEE1394
 
 comment "Texas Instruments PCILynx requires I2C"
        depends on IEEE1394
 
 comment "Texas Instruments PCILynx requires I2C"


@@ -91,6 +53,10 @@ config IEEE1394_PCILYNX
          To compile this driver as a module, say M here: the
          module will be called pcilynx.
 
          To compile this driver as a module, say M here: the
          module will be called pcilynx.
 

+         Only some old and now very rare PCI and CardBus cards and
+         PowerMacs G3 B&W contain the PCILynx controller.  Therefore
+         almost everybody can say N here.
+

 config IEEE1394_OHCI1394
        tristate "OHCI-1394 support"
        depends on PCI && IEEE1394
 config IEEE1394_OHCI1394
        tristate "OHCI-1394 support"
        depends on PCI && IEEE1394


@@ -104,7 +70,7 @@ config IEEE1394_OHCI1394
          To compile this driver as a module, say M here: the
          module will be called ohci1394.
 
          To compile this driver as a module, say M here: the
          module will be called ohci1394.
 

-comment "Protocol Drivers"
+comment "Protocols"

        depends on IEEE1394
 
 config IEEE1394_VIDEO1394
        depends on IEEE1394
 
 config IEEE1394_VIDEO1394


@@ -142,11 +108,15 @@ config IEEE1394_SBP2_PHYS_DMA
          This option is buggy and currently broken on some architectures.
          If unsure, say N.
 
          This option is buggy and currently broken on some architectures.
          If unsure, say N.
 

+config IEEE1394_ETH1394_ROM_ENTRY
+       depends on IEEE1394
+       bool
+       default n
+

 config IEEE1394_ETH1394
 config IEEE1394_ETH1394

-       tristate "Ethernet over 1394"
+       tristate "IP over 1394"

        depends on IEEE1394 && EXPERIMENTAL && INET
        depends on IEEE1394 && EXPERIMENTAL && INET

-       select IEEE1394_CONFIG_ROM_IP1394
-       select IEEE1394_EXTRA_CONFIG_ROMS
+       select IEEE1394_ETH1394_ROM_ENTRY

        help
          This driver implements a functional majority of RFC 2734: IPv4 over
          1394.  It will provide IP connectivity with implementations of RFC
        help
          This driver implements a functional majority of RFC 2734: IPv4 over
          1394.  It will provide IP connectivity with implementations of RFC


@@ -155,24 +125,26 @@ config IEEE1394_ETH1394
          This driver is still considered experimental.  It does not yet support
          MCAP, therefore multicast support is significantly limited.
 
          This driver is still considered experimental.  It does not yet support
          MCAP, therefore multicast support is significantly limited.
 

+         The module is called eth1394 although it does not emulate Ethernet.
+

 config IEEE1394_DV1394
        tristate "OHCI-DV I/O support (deprecated)"
        depends on IEEE1394 && IEEE1394_OHCI1394
        help
 config IEEE1394_DV1394
        tristate "OHCI-DV I/O support (deprecated)"
        depends on IEEE1394 && IEEE1394_OHCI1394
        help

-         The dv1394 driver will be removed from Linux in a future release.
-         Its functionality is now provided by raw1394 together with libraries
-         such as libiec61883.
+         The dv1394 driver is unsupported and may be removed from Linux in a
+         future release.  Its functionality is now provided by raw1394 together
+         with libraries such as libiec61883.

 
 config IEEE1394_RAWIO
        tristate "Raw IEEE1394 I/O support"
        depends on IEEE1394
        help
 
 config IEEE1394_RAWIO
        tristate "Raw IEEE1394 I/O support"
        depends on IEEE1394
        help

-         Say Y here if you want support for the raw device. This is generally
-         a good idea, so you should say Y here. The raw device enables
-         direct communication of user programs with the IEEE 1394 bus and
-         thus with the attached peripherals.
+         This option adds support for the raw1394 device file which enables
+         direct communication of user programs with the IEEE 1394 bus and thus
+         with the attached peripherals.  Almost all application programs which
+         access FireWire require this option.

 
 

-         To compile this driver as a module, say M here: the
-         module will be called raw1394.
+         To compile this driver as a module, say M here: the module will be
+         called raw1394.

 
 endmenu
 
 endmenu