diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/scsi/initio.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/scsi/initio.c')
| -rw-r--r-- | drivers/scsi/initio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 9627d062e16b..dd741bcd6ccd 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c | |||
| @@ -242,7 +242,7 @@ static u8 i91udftNvRam[64] = | |||
| 242 | 242 | ||
| 243 | static u8 initio_rate_tbl[8] = /* fast 20 */ | 243 | static u8 initio_rate_tbl[8] = /* fast 20 */ |
| 244 | { | 244 | { |
| 245 | /* nanosecond devide by 4 */ | 245 | /* nanosecond divide by 4 */ |
| 246 | 12, /* 50ns, 20M */ | 246 | 12, /* 50ns, 20M */ |
| 247 | 18, /* 75ns, 13.3M */ | 247 | 18, /* 75ns, 13.3M */ |
| 248 | 25, /* 100ns, 10M */ | 248 | 25, /* 100ns, 10M */ |
| @@ -1917,7 +1917,7 @@ static int int_initio_scsi_rst(struct initio_host * host) | |||
| 1917 | } | 1917 | } |
| 1918 | 1918 | ||
| 1919 | /** | 1919 | /** |
| 1920 | * int_initio_scsi_resel - Reselection occured | 1920 | * int_initio_scsi_resel - Reselection occurred |
| 1921 | * @host: InitIO host adapter | 1921 | * @host: InitIO host adapter |
| 1922 | * | 1922 | * |
| 1923 | * A SCSI reselection event has been signalled and the interrupt | 1923 | * A SCSI reselection event has been signalled and the interrupt |