diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
| commit | 1b7f6a626f0ff511c3840678466cbfe1d62c0b29 (patch) | |
| tree | 415e8c838c0067bff384afb8a2c91e5f7c6d11d3 /drivers/scsi/imm.c | |
| parent | b3edc9cec07ade41aaf1804f7c9e876afa90c862 (diff) | |
| parent | 3f5a6ca31c334011fd929501a078424c0d3f71be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/imm.c')
| -rw-r--r-- | drivers/scsi/imm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 2d95ac9c32c1..e31f6122106f 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c | |||
| @@ -1153,7 +1153,7 @@ static int __imm_attach(struct parport *pb) | |||
| 1153 | { | 1153 | { |
| 1154 | struct Scsi_Host *host; | 1154 | struct Scsi_Host *host; |
| 1155 | imm_struct *dev; | 1155 | imm_struct *dev; |
| 1156 | DECLARE_WAIT_QUEUE_HEAD(waiting); | 1156 | DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waiting); |
| 1157 | DEFINE_WAIT(wait); | 1157 | DEFINE_WAIT(wait); |
| 1158 | int ports; | 1158 | int ports; |
| 1159 | int modes, ppb; | 1159 | int modes, ppb; |