diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 14:25:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 14:25:00 -0400 |
| commit | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (patch) | |
| tree | 922d058f751964ccf73f5705d7c492b6d45a9425 /drivers/scsi/Kconfig | |
| parent | 42cadc86008aae0fd9ff31642dc01ed50723cf32 (diff) | |
| parent | ecc1241e80a0bdc854b1602a44be3ad106753d4f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (40 commits)
[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug
[SCSI] aic7xxx: add const
[SCSI] aic7xxx: add static
[SCSI] aic7xxx: Update _shipped files
[SCSI] aic7xxx: teach aicasm to not emit unused debug code/data
[SCSI] qla2xxx: Update version number to 8.02.01-k2.
[SCSI] qla2xxx: Correct regression in relogin code.
[SCSI] qla2xxx: Correct misc. endian and byte-ordering issues.
[SCSI] qla2xxx: make qla2x00_issue_iocb_timeout() static
[SCSI] qla2xxx: qla_os.c, make 2 functions static
[SCSI] qla2xxx: Re-register FDMI information after a LIP.
[SCSI] qla2xxx: Correct SRB usage-after-completion/free issues.
[SCSI] qla2xxx: Correct ISP84XX verify-chip response handling.
[SCSI] qla2xxx: Wakeup DPC thread to process any deferred-work requests.
[SCSI] qla2xxx: Collapse RISC-RAM retrieval code during a firmware-dump.
[SCSI] m68k: new mac_esp scsi driver
[SCSI] zfcp: Add some statistics provided by the FCP adapter to the sysfs
[SCSI] zfcp: Print some messages only during ERP
[SCSI] zfcp: Wait for free SBAL during exchange config
[SCSI] scsi_transport_fc: fc_user_scan correction
...
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 7f78e3ea517d..99c57b0c1d54 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1677,6 +1677,16 @@ config MAC_SCSI | |||
| 1677 | SCSI-HOWTO, available from | 1677 | SCSI-HOWTO, available from |
| 1678 | <http://www.tldp.org/docs.html#howto>. | 1678 | <http://www.tldp.org/docs.html#howto>. |
| 1679 | 1679 | ||
| 1680 | config SCSI_MAC_ESP | ||
| 1681 | tristate "Macintosh NCR53c9[46] SCSI" | ||
| 1682 | depends on MAC && SCSI | ||
| 1683 | help | ||
| 1684 | This is the NCR 53c9x SCSI controller found on most of the 68040 | ||
| 1685 | based Macintoshes. | ||
| 1686 | |||
| 1687 | To compile this driver as a module, choose M here: the module | ||
| 1688 | will be called mac_esp. | ||
| 1689 | |||
| 1680 | config MVME147_SCSI | 1690 | config MVME147_SCSI |
| 1681 | bool "WD33C93 SCSI driver for MVME147" | 1691 | bool "WD33C93 SCSI driver for MVME147" |
| 1682 | depends on MVME147 && SCSI=y | 1692 | depends on MVME147 && SCSI=y |