diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /drivers/scsi | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/FlashPoint.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/gdth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index 5beed4f6d985..8d64f0bed628 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
| @@ -149,7 +149,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO; | |||
| 149 | #define PCI_BUS_CARD 0x03 | 149 | #define PCI_BUS_CARD 0x03 |
| 150 | #define VESA_BUS_CARD 0x04 | 150 | #define VESA_BUS_CARD 0x04 |
| 151 | 151 | ||
| 152 | /* SCCB struc used for both SCCB and UCB manager compiles! | 152 | /* SCCB struct used for both SCCB and UCB manager compiles! |
| 153 | * The UCB Manager treats the SCCB as it's 'native hardware structure' | 153 | * The UCB Manager treats the SCCB as it's 'native hardware structure' |
| 154 | */ | 154 | */ |
| 155 | 155 | ||
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a6deb016584c..bd3ffdf6c800 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
| @@ -328,7 +328,7 @@ | |||
| 328 | * hdr_channel:x x - number of virtual bus for host drives | 328 | * hdr_channel:x x - number of virtual bus for host drives |
| 329 | * shared_access:Y disable driver reserve/release protocol to | 329 | * shared_access:Y disable driver reserve/release protocol to |
| 330 | * access a shared resource from several nodes, | 330 | * access a shared resource from several nodes, |
| 331 | * appropiate controller firmware required | 331 | * appropriate controller firmware required |
| 332 | * shared_access:N enable driver reserve/release protocol | 332 | * shared_access:N enable driver reserve/release protocol |
| 333 | * probe_eisa_isa:Y scan for EISA/ISA controllers | 333 | * probe_eisa_isa:Y scan for EISA/ISA controllers |
| 334 | * probe_eisa_isa:N do not scan for EISA/ISA controllers | 334 | * probe_eisa_isa:N do not scan for EISA/ISA controllers |