diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/scsi/imm.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (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; |