diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
| commit | ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3 (patch) | |
| tree | 3785afef7c0f7b72ec87f88fc19b88bfb48386fe /drivers/scsi | |
| parent | e031d33efde817ce6b4f907f0fa1ff021301748f (diff) | |
| parent | 2b422383c3d8dcd203dd9aea70155be6258dbf6c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
README: bzip2 is not new
Documentation/Changes: remove outdated translation references
remove dead Radeon URL
SCSI_AACRAID: add a help text
update the i386 defconfig
MAINTAINERS: remove the LANMEDIA entry
Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 3c606cf8c8ca..5c94a5d4efc0 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -379,6 +379,14 @@ config SCSI_AHA1740 | |||
| 379 | config SCSI_AACRAID | 379 | config SCSI_AACRAID |
| 380 | tristate "Adaptec AACRAID support" | 380 | tristate "Adaptec AACRAID support" |
| 381 | depends on SCSI && PCI | 381 | depends on SCSI && PCI |
| 382 | help | ||
| 383 | This driver supports a variety of Dell, HP, Adaptec, IBM and | ||
| 384 | ICP storage products. For a list of supported products, refer | ||
| 385 | to <file:Documentation/scsi/aacraid.txt>. | ||
| 386 | |||
| 387 | To compile this driver as a module, choose M here: the module | ||
| 388 | will be called aacraid. | ||
| 389 | |||
| 382 | 390 | ||
| 383 | source "drivers/scsi/aic7xxx/Kconfig.aic7xxx" | 391 | source "drivers/scsi/aic7xxx/Kconfig.aic7xxx" |
| 384 | 392 | ||