7 files changed, 255 insertions, 140 deletions

diff --git a/Documentation/hwmon/emc2103 b/Documentation/hwmon/emc2103
new file mode 100644
index 000000000000..a12b2c127140
--- /dev/null
+++ b/Documentation/hwmon/emc2103
@@ -0,0 +1,33 @@
+Kernel driver emc2103
+======================
+
+Supported chips:
+  * SMSC EMC2103
+    Addresses scanned: I2C 0x2e
+    Prefix: 'emc2103'
+    Datasheet: Not public
+
+Authors:
+        Steve Glendinning <steve.glendinning@smsc.com>
+
+Description
+-----------
+
+The Standard Microsystems Corporation (SMSC) EMC2103 chips
+contain up to 4 temperature sensors and a single fan controller.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 1, the lowest
+representable value is 480 RPM.
+
+This driver supports RPM based control, to use this a fan target
+should be written to fan1_target and pwm1_enable should be set to 3.
+
+The 2103-2 and 2103-4 variants have a third temperature sensor, which can
+be connected to two anti-parallel diodes.  These values can be read
+as temp3 and temp4.  If only one diode is attached to this channel, temp4
+will show as "fault".  The module parameter "apd=0" can be used to suppress
+this 4th channel when anti-parallel diodes are not fitted.
diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
index 86b5880d8502..b478b0864965 100644
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
@@ -72,9 +72,31 @@ in6_min_alarm		5v  output undervoltage alarm
 in7_min_alarm           3v  output undervoltage alarm
 in8_min_alarm           Vee (-12v) output undervoltage alarm
 
-in9_input               GPIO voltage data
+in9_input               GPIO voltage data (see note 1)
+in10_input              GPIO voltage data (see note 1)
+in11_input              GPIO voltage data (see note 1)
 
 power1_input            12v power usage (mW)
 power2_input            5v  power usage (mW)
 power3_input            3v  power usage (mW)
 power4_input            Vee (-12v) power usage (mW)
+
+
+Note 1
+------
+
+If you have NOT configured the driver to sample all GPIO pins as analog
+voltages, then the in10_input and in11_input sysfs attributes will not be
+created. The driver will sample the GPIO pin that is currently connected to the
+ADC as an analog voltage, and report the value in in9_input.
+
+If you have configured the driver to sample all GPIO pins as analog voltages,
+then they will be sampled in round-robin fashion. If userspace reads too
+slowly, -EAGAIN will be returned when you read the sysfs attribute containing
+the sensor reading.
+
+The LTC4245 chip can be configured to sample all GPIO pins with two methods:
+1) platform data -- see include/linux/i2c/ltc4245.h
+2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip
+
+The default mode of operation is to sample a single GPIO pin.
diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427
index db5cc1227a83..8fdd08c9e48b 100644
--- a/Documentation/hwmon/pc87427
+++ b/Documentation/hwmon/pc87427
@@ -18,10 +18,11 @@ Description
 
 The National Semiconductor Super I/O chip includes complete hardware
 monitoring capabilities. It can monitor up to 18 voltages, 8 fans and
-6 temperature sensors. Only the fans are supported at the moment.
+6 temperature sensors. Only the fans and temperatures are supported at
+the moment, voltages aren't.
 
-This chip also has fan controlling features, which are not yet supported
-by this driver either.
+This chip also has fan controlling features (up to 4 PWM outputs),
+which are partly supported by this driver.
 
 The driver assumes that no more than one chip is present, which seems
 reasonable.
@@ -36,3 +37,23 @@ signal. Speeds down to 83 RPM can be measured.
 An alarm is triggered if the rotation speed drops below a programmable
 limit. Another alarm is triggered if the speed is too low to be measured
 (including stalled or missing fan).
+
+
+Fan Speed Control
+-----------------
+
+Fan speed can be controlled by PWM outputs. There are 4 possible modes:
+always off, always on, manual and automatic. The latter isn't supported
+by the driver: you can only return to that mode if it was the original
+setting, and the configuration interface is missing.
+
+
+Temperature Monitoring
+----------------------
+
+The PC87427 relies on external sensors (following the SensorPath
+standard), so the resolution and range depend on the type of sensor
+connected. The integer part can be 8-bit or 9-bit, and can be signed or
+not. I couldn't find a way to figure out the external sensor data
+temperature format, so user-space adjustment (typically by a factor 2)
+may be required.
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index d4e2917c6f18..ff45d1f837c8 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -107,10 +107,24 @@ in[0-*]_min	Voltage min value.
                 Unit: millivolt
                 RW
                 
+in[0-*]_lcrit   Voltage critical min value.
+                Unit: millivolt
+                RW
+                If voltage drops to or below this limit, the system may
+                take drastic action such as power down or reset. At the very
+                least, it should report a fault.
+
 in[0-*]_max     Voltage max value.
                 Unit: millivolt
                 RW
                 
+in[0-*]_crit    Voltage critical max value.
+                Unit: millivolt
+                RW
+                If voltage reaches or exceeds this limit, the system may
+                take drastic action such as power down or reset. At the very
+                least, it should report a fault.
+
 in[0-*]_input   Voltage input value.
                 Unit: millivolt
                 RO
@@ -284,7 +298,7 @@ temp[1-*]_input Temperature input value.
                 Unit: millidegree Celsius
                 RO
 
-temp[1-*]_crit  Temperature critical value, typically greater than
+temp[1-*]_crit  Temperature critical max value, typically greater than
                 corresponding temp_max values.
                 Unit: millidegree Celsius
                 RW
@@ -296,6 +310,11 @@ temp[1-*]_crit_hyst
                 from the critical value.
                 RW
 
+temp[1-*]_lcrit Temperature critical min value, typically lower than
+                corresponding temp_min values.
+                Unit: millidegree Celsius
+                RW
+
 temp[1-*]_offset
                 Temperature offset which is added to the temperature reading
                 by the chip.
@@ -344,9 +363,6 @@ Also see the Alarms section for status flags associated with temperatures.
 * Currents *
 ************
 
-Note that no known chip provides current measurements as of writing,
-so this part is theoretical, so to say.
-
 curr[1-*]_max   Current max value
                 Unit: milliampere
                 RW
@@ -471,6 +487,7 @@ limit-related alarms, not both. The driver should just reflect the hardware
 implementation.
 
 in[0-*]_alarm
+curr[1-*]_alarm
 fan[1-*]_alarm
 temp[1-*]_alarm
                 Channel alarm
@@ -482,6 +499,8 @@ OR
 
 in[0-*]_min_alarm
 in[0-*]_max_alarm
+curr[1-*]_min_alarm
+curr[1-*]_max_alarm
 fan[1-*]_min_alarm
 fan[1-*]_max_alarm
 temp[1-*]_min_alarm
@@ -497,7 +516,6 @@ to notify open diodes, unconnected fans etc. where the hardware
 supports it. When this boolean has value 1, the measurement for that
 channel should not be trusted.
 
-in[0-*]_fault
 fan[1-*]_fault
 temp[1-*]_fault
                 Input fault condition
@@ -513,6 +531,7 @@ beep_enable	Master beep enable
                 RW
 
 in[0-*]_beep
+curr[1-*]_beep
 fan[1-*]_beep
 temp[1-*]_beep
                 Channel beep
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index b7e42ec4b26b..13d556112fc0 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -20,6 +20,10 @@ Supported chips:
     Prefix: 'w83667hg'
     Addresses scanned: ISA address retrieved from Super I/O registers
     Datasheet: not available
+  * Winbond W83667HG-B
+    Prefix: 'w83667hg'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: Available from Nuvoton upon request
 
 Authors:
         Jean Delvare <khali@linux-fr.org>
@@ -32,8 +36,8 @@ Description
 -----------
 
 This driver implements support for the Winbond W83627EHF, W83627EHG,
-W83627DHG, W83627DHG-P and W83667HG super I/O chips. We will refer to them
-collectively as Winbond chips.
+W83627DHG, W83627DHG-P, W83667HG and W83667HG-B super I/O chips.
+We will refer to them collectively as Winbond chips.
 
 The chips implement three temperature sensors, five fan rotation
 speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
@@ -68,14 +72,15 @@ follows:
 temp1 -> pwm1
 temp2 -> pwm2
 temp3 -> pwm3
-prog  -> pwm4 (not on 667HG; the programmable setting is not supported by
-               the driver)
+prog  -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not
+               supported by the driver)
 
 /sys files
 ----------
 
 name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
-       it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg"
+       it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg",
+       and for the W83667HG it is set to "w83667hg".
 
 pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
            0 (stop) to 255 (full)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 873b68090098..4956686f99bf 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -88,8 +88,8 @@ parameter is applicable:
         RAM     RAM disk support is enabled.
         S390    S390 architecture is enabled.
         SCSI    Appropriate SCSI support is enabled.
-                        A lot of drivers has their options described inside of
-                        Documentation/scsi/.
+                        A lot of drivers have their options described inside
+                        the Documentation/scsi/ sub-directory.
         SECURITY Different security models are enabled.
         SELINUX SELinux support is enabled.
         APPARMOR AppArmor support is enabled.
@@ -284,27 +284,12 @@ and is between 256 and 4096 characters. It is defined in the file
         add_efi_memmap  [EFI; X86] Include EFI memory map in
                         kernel's map of available physical RAM.
 
-        advansys=       [HW,SCSI]
-                        See header of drivers/scsi/advansys.c.
-
         agp=            [AGP]
                         { off | try_unsupported }
                         off: disable AGP support
                         try_unsupported: try to drive unsupported chipsets
                                 (may crash computer or cause data corruption)
 
-        aha152x=        [HW,SCSI]
-                        See Documentation/scsi/aha152x.txt.
-
-        aha1542=        [HW,SCSI]
-                        Format: <portbase>[,<buson>,<busoff>[,<dmaspeed>]]
-
-        aic7xxx=        [HW,SCSI]
-                        See Documentation/scsi/aic7xxx.txt.
-
-        aic79xx=        [HW,SCSI]
-                        See Documentation/scsi/aic79xx.txt.
-
         ALSA            [HW,ALSA]
                         See Documentation/sound/alsa/alsa-parameters.txt
 
@@ -368,8 +353,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         atarimouse=     [HW,MOUSE] Atari Mouse
 
-        atascsi=        [HW,SCSI] Atari SCSI
-
         atkbd.extra=    [HW] Enable extra LEDs and keys on IBM RapidAccess,
                         EzKey and similar keyboards
 
@@ -419,10 +402,6 @@ and is between 256 and 4096 characters. It is defined in the file
         bttv.pll=       See Documentation/video4linux/bttv/Insmod-options
         bttv.tuner=     and Documentation/video4linux/bttv/CARDLIST
 
-        BusLogic=       [HW,SCSI]
-                        See drivers/scsi/BusLogic.c, comment before function
-                        BusLogic_ParseDriverOptions().
-
         c101=           [NET] Moxa C101 synchronous serial card
 
         cachesize=      [BUGS=X86-32] Override level 2 CPU cache size detection.
@@ -671,8 +650,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         dscc4.setup=    [NET]
 
-        dtc3181e=       [HW,SCSI]
-
         dynamic_printk  Enables pr_debug()/dev_dbg() calls if
                         CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled.
                         These can also be switched on/off via
@@ -713,8 +690,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         This is desgined to be used in conjunction with
                         the boot argument: earlyprintk=vga
 
-        eata=           [HW,SCSI]
-
         edd=            [EDD]
                         Format: {"off" | "on" | "skip[mbr]"}
 
@@ -770,12 +745,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <interval>,<probability>,<space>,<times>
                         See also /Documentation/fault-injection/.
 
-        fd_mcs=         [HW,SCSI]
-                        See header of drivers/scsi/fd_mcs.c.
-
-        fdomain=        [HW,SCSI]
-                        See header of drivers/scsi/fdomain.c.
-
         floppy=         [HW]
                         See Documentation/blockdev/floppy.txt.
 
@@ -835,14 +804,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         When zero, profiling data is discarded and associated
                         debugfs files are removed at module unload time.
 
-        gdth=           [HW,SCSI]
-                        See header of drivers/scsi/gdth.c.
-
         gpt             [EFI] Forces disk with valid GPT signature but
                         invalid Protective MBR to be treated as GPT.
 
-        gvp11=          [HW,SCSI]
-
         hashdist=       [KNL,NUMA] Large hashes allocated during boot
                         are distributed across NUMA nodes.  Defaults on
                         for 64bit NUMA, off otherwise.
@@ -931,9 +895,6 @@ and is between 256 and 4096 characters. It is defined in the file
         i8k.restricted  [HW] Allow controlling fans only if SYS_ADMIN
                         capability is set.
 
-        ibmmcascsi=     [HW,MCA,SCSI] IBM MicroChannel SCSI adapter
-                        See Documentation/mca.txt.
-
         icn=            [HW,ISDN]
                         Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 
@@ -983,9 +944,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         programs exec'd, files mmap'd for exec, and all files
                         opened for read by uid=0.
 
-        in2000=         [HW,SCSI]
-                        See header of drivers/scsi/in2000.c.
-
         init=           [KNL]
                         Format: <full_path>
                         Run specified binary instead of /sbin/init as init
@@ -1063,9 +1021,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         See comment before ip2_setup() in
                         drivers/char/ip2/ip2base.c.
 
-        ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
-                        See header of drivers/scsi/ips.c.
-
         irqfixup        [HW]
                         When an interrupt is not handled search all handlers
                         for it. Intended to get systems with badly broken
@@ -1341,9 +1296,6 @@ and is between 256 and 4096 characters. It is defined in the file
         ltpc=           [NET]
                         Format: <io>,<irq>,<dma>
 
-        mac5380=        [HW,SCSI] Format:
-                        <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
-
         machvec=        [IA64] Force the use of a particular machine-vector
                         (machvec) in a generic kernel.
                         Example: machvec=hpzx1_swiotlb
@@ -1365,13 +1317,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         be mounted
                         Format: <1-256>
 
-        max_luns=       [SCSI] Maximum number of LUNs to probe.
-                        Should be between 1 and 2^32-1.
-
-        max_report_luns=
-                        [SCSI] Maximum number of LUNs received.
-                        Should be between 1 and 16384.
-
         mcatest=        [IA-64]
 
         mce             [X86-32] Machine Check Exception
@@ -1568,19 +1513,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         n2=             [NET] SDL Inc. RISCom/N2 synchronous serial card
 
-        NCR_D700=       [HW,SCSI]
-                        See header of drivers/scsi/NCR_D700.c.
-
-        ncr5380=        [HW,SCSI]
-
-        ncr53c400=      [HW,SCSI]
-
-        ncr53c400a=     [HW,SCSI]
-
-        ncr53c406a=     [HW,SCSI]
-
-        ncr53c8xx=      [HW,SCSI]
-
         netdev=         [NET] Network devices parameters
                         Format: <irq>,<io>,<mem_start>,<mem_end>,<name>
                         Note that mem_start is often overloaded to mean
@@ -1859,10 +1791,6 @@ and is between 256 and 4096 characters. It is defined in the file
         OSS             [HW,OSS]
                         See Documentation/sound/oss/oss-parameters.txt
 
-        osst=           [HW,SCSI] SCSI Tape Driver
-                        Format: <buffer_size>,<write_threshold>
-                        See also Documentation/scsi/st.txt.
-
         panic=          [KNL] Kernel behaviour on panic
                         Format: <timeout>
 
@@ -1895,9 +1823,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Currently this function knows 686a and 8231 chips.
                         Format: [spp|ps2|epp|ecp|ecpepp]
 
-        pas16=          [HW,SCSI]
-                        See header of drivers/scsi/pas16.c.
-
         pause_on_oops=
                         Halt all CPUs after the first oops has been printed for
                         the specified number of seconds.  This is to be used if
@@ -2264,30 +2189,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         sched_debug     [KNL] Enables verbose scheduler debug messages.
 
-        scsi_debug_*=   [SCSI]
-                        See drivers/scsi/scsi_debug.c.
-
-        scsi_default_dev_flags=
-                        [SCSI] SCSI default device flags
-                        Format: <integer>
-
-        scsi_dev_flags= [SCSI] Black/white list entry for vendor and model
-                        Format: <vendor>:<model>:<flags>
-                        (flags are integer value)
-
-        scsi_logging_level=     [SCSI] a bit mask of logging levels
-                        See drivers/scsi/scsi_logging.h for bits.  Also
-                        settable via sysctl at dev.scsi.logging_level
-                        (/proc/sys/dev/scsi/logging_level).
-                        There is also a nice 'scsi_logging_level' script in the
-                        S390-tools package, available for download at
-                        http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
-
-        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
-                        discovered.  async scans them in kernel threads,
-                        allowing boot to proceed.  none ignores them, expecting
-                        user space to do the scan.
-
         security=       [SECURITY] Choose a security module to enable at boot.
                         If this boot parameter is not specified, only the first
                         security module asking for security registration will be
@@ -2321,9 +2222,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         The parameter means the number of CPUs to show,
                         for example 1 means boot CPU only.
 
-        sim710=         [SCSI,HW]
-                        See header of drivers/scsi/sim710.c.
-
         simeth=         [IA-64]
         simscsi=
 
@@ -2395,9 +2293,6 @@ and is between 256 and 4096 characters. It is defined in the file
         spia_pedr=
         spia_peddr=
 
-        st=             [HW,SCSI] SCSI tape parameters (buffers, etc.)
-                        See Documentation/scsi/st.txt.
-
         stacktrace      [FTRACE]
                         Enabled the stack tracer on boot up.
 
@@ -2455,18 +2350,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
         switches=       [HW,M68k]
 
-        sym53c416=      [HW,SCSI]
-                        See header of drivers/scsi/sym53c416.c.
-
         sysrq_always_enabled
                         [KNL]
                         Ignore sysrq setting - this boot parameter will
                         neutralize any effect of /proc/sys/kernel/sysrq.
                         Useful for debugging.
 
-        t128=           [HW,SCSI]
-                        See header of drivers/scsi/t128.c.
-
         tdfx=           [HW,DRM]
 
         test_suspend=   [SUSPEND]
@@ -2503,10 +2392,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         <deci-seconds>: poll all this frequency
                         0: no polling (default)
 
-        tmscsim=        [HW,SCSI]
-                        See comment before function dc390_setup() in
-                        drivers/scsi/tmscsim.c.
-
         topology=       [S390]
                         Format: {off | on}
                         Specify if the kernel should make use of the cpu
@@ -2547,9 +2432,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
                         See also Documentation/input/joystick-parport.txt
 
-        u14-34f=        [HW,SCSI] UltraStor 14F/34F SCSI host adapter
-                        See header of drivers/scsi/u14-34f.c.
-
         uhash_entries=  [KNL,NET]
                         Set number of hash buckets for UDP/UDP-Lite connections
 
@@ -2715,12 +2597,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         overridden by individual drivers. 0 will hide
                         cursors, 1 will display them.
 
-        wd33c93=        [HW,SCSI]
-                        See header of drivers/scsi/wd33c93.c.
-
-        wd7000=         [HW,SCSI]
-                        See header of drivers/scsi/wd7000.c.
-
         watchdog timers [HW,WDT] For information on watchdog timers,
                         see Documentation/watchdog/watchdog-parameters.txt
                         or other driver-specific files in the
diff --git a/Documentation/scsi/scsi-parameters.txt b/Documentation/scsi/scsi-parameters.txt
new file mode 100644
index 000000000000..21e5798526ee
--- /dev/null
+++ b/Documentation/scsi/scsi-parameters.txt
@@ -0,0 +1,139 @@
+                          SCSI Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~~
+
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+
+
+        advansys=       [HW,SCSI]
+                        See header of drivers/scsi/advansys.c.
+
+        aha152x=        [HW,SCSI]
+                        See Documentation/scsi/aha152x.txt.
+
+        aha1542=        [HW,SCSI]
+                        Format: <portbase>[,<buson>,<busoff>[,<dmaspeed>]]
+
+        aic7xxx=        [HW,SCSI]
+                        See Documentation/scsi/aic7xxx.txt.
+
+        aic79xx=        [HW,SCSI]
+                        See Documentation/scsi/aic79xx.txt.
+
+        atascsi=        [HW,SCSI] Atari SCSI
+
+        BusLogic=       [HW,SCSI]
+                        See drivers/scsi/BusLogic.c, comment before function
+                        BusLogic_ParseDriverOptions().
+
+        dtc3181e=       [HW,SCSI]
+
+        eata=           [HW,SCSI]
+
+        fd_mcs=         [HW,SCSI]
+                        See header of drivers/scsi/fd_mcs.c.
+
+        fdomain=        [HW,SCSI]
+                        See header of drivers/scsi/fdomain.c.
+
+        gdth=           [HW,SCSI]
+                        See header of drivers/scsi/gdth.c.
+
+        gvp11=          [HW,SCSI]
+
+        ibmmcascsi=     [HW,MCA,SCSI] IBM MicroChannel SCSI adapter
+                        See Documentation/mca.txt.
+
+        in2000=         [HW,SCSI]
+                        See header of drivers/scsi/in2000.c.
+
+        ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
+                        See header of drivers/scsi/ips.c.
+
+        mac5380=        [HW,SCSI] Format:
+                        <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
+
+        max_luns=       [SCSI] Maximum number of LUNs to probe.
+                        Should be between 1 and 2^32-1.
+
+        max_report_luns=
+                        [SCSI] Maximum number of LUNs received.
+                        Should be between 1 and 16384.
+
+        NCR_D700=       [HW,SCSI]
+                        See header of drivers/scsi/NCR_D700.c.
+
+        ncr5380=        [HW,SCSI]
+
+        ncr53c400=      [HW,SCSI]
+
+        ncr53c400a=     [HW,SCSI]
+
+        ncr53c406a=     [HW,SCSI]
+
+        ncr53c8xx=      [HW,SCSI]
+
+        nodisconnect    [HW,SCSI,M68K] Disables SCSI disconnects.
+
+        osst=           [HW,SCSI] SCSI Tape Driver
+                        Format: <buffer_size>,<write_threshold>
+                        See also Documentation/scsi/st.txt.
+
+        pas16=          [HW,SCSI]
+                        See header of drivers/scsi/pas16.c.
+
+        scsi_debug_*=   [SCSI]
+                        See drivers/scsi/scsi_debug.c.
+
+        scsi_default_dev_flags=
+                        [SCSI] SCSI default device flags
+                        Format: <integer>
+
+        scsi_dev_flags= [SCSI] Black/white list entry for vendor and model
+                        Format: <vendor>:<model>:<flags>
+                        (flags are integer value)
+
+        scsi_logging_level=     [SCSI] a bit mask of logging levels
+                        See drivers/scsi/scsi_logging.h for bits.  Also
+                        settable via sysctl at dev.scsi.logging_level
+                        (/proc/sys/dev/scsi/logging_level).
+                        There is also a nice 'scsi_logging_level' script in the
+                        S390-tools package, available for download at
+                        http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
+
+        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
+                        discovered.  async scans them in kernel threads,
+                        allowing boot to proceed.  none ignores them, expecting
+                        user space to do the scan.
+
+        sim710=         [SCSI,HW]
+                        See header of drivers/scsi/sim710.c.
+
+        st=             [HW,SCSI] SCSI tape parameters (buffers, etc.)
+                        See Documentation/scsi/st.txt.
+
+        sym53c416=      [HW,SCSI]
+                        See header of drivers/scsi/sym53c416.c.
+
+        t128=           [HW,SCSI]
+                        See header of drivers/scsi/t128.c.
+
+        tmscsim=        [HW,SCSI]
+                        See comment before function dc390_setup() in
+                        drivers/scsi/tmscsim.c.
+
+        u14-34f=        [HW,SCSI] UltraStor 14F/34F SCSI host adapter
+                        See header of drivers/scsi/u14-34f.c.
+
+        wd33c93=        [HW,SCSI]
+                        See header of drivers/scsi/wd33c93.c.
+
+        wd7000=         [HW,SCSI]
+                        See header of drivers/scsi/wd7000.c.