diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 21:13:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 21:13:48 -0400 |
| commit | a3ad7f128c637b7612ebeacb1f85fec933bb1195 (patch) | |
| tree | bbfe3773752cb483c55a4701fa954caf09933049 | |
| parent | 9b79022ca909b66e2cd0cfd9248f832fc165f77f (diff) | |
| parent | 00eabe7c4478f38b42d632763c4878ced5a1f25c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] qla2xxx: fix msleep compile error
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 7a4409ab30ea..a319a20ed440 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kthread.h> | 9 | #include <linux/kthread.h> |
| 10 | #include <linux/vmalloc.h> | 10 | #include <linux/vmalloc.h> |
| 11 | #include <linux/delay.h> | ||
| 11 | 12 | ||
| 12 | static int qla24xx_vport_disable(struct fc_vport *, bool); | 13 | static int qla24xx_vport_disable(struct fc_vport *, bool); |
| 13 | 14 | ||