s3c2410fb: fix incorrect argument type in resume function

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

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 5c0b522ae0778770c1f223c4cb7b868f33d05437..545663ef820b3992211d4dab31a05ea28f7272c4 100644 (file)
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -1,6 +1,7 @@
-# -*- shell-script -*-
-
 menu "IEEE 1394 (FireWire) support"
+       depends on PCI || BROKEN
+
+source "drivers/firewire/Kconfig"
 
 config IEEE1394
        tristate "IEEE 1394 (FireWire) support"
@@ -34,7 +35,7 @@ config IEEE1394_VERBOSEDEBUG
          Say Y if you really want or need the debugging output, everyone
          else says N.
 
-comment "Device Drivers"
+comment "Controllers"
        depends on IEEE1394
 
 comment "Texas Instruments PCILynx requires I2C"
@@ -52,6 +53,10 @@ config IEEE1394_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
@@ -65,7 +70,7 @@ config IEEE1394_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
@@ -92,7 +97,7 @@ config IEEE1394_SBP2
 
 config IEEE1394_SBP2_PHYS_DMA
        bool "Enable replacement for physical DMA in SBP2"
-       depends on IEEE1394 && IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)
+       depends on IEEE1394_SBP2 && VIRT_TO_BUS && EXPERIMENTAL
        help
          This builds sbp2 for use with non-OHCI host adapters which do not
          support physical DMA or for when ohci1394 is run with phys_dma=0.
@@ -134,12 +139,12 @@ 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