diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 18:13:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 18:13:48 -0700 |
| commit | a3ad7f128c637b7612ebeacb1f85fec933bb1195 (patch) | |
| tree | bbfe3773752cb483c55a4701fa954caf09933049 | |
| parent | Fix 'get_user_pages_fast()' with non-page-aligned start address (diff) | |
| parent | [SCSI] qla2xxx: fix msleep compile error (diff) | |
| download | linux-dev-a3ad7f128c637b7612ebeacb1f85fec933bb1195.tar.xz linux-dev-a3ad7f128c637b7612ebeacb1f85fec933bb1195.zip | |
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 @@ #include <linux/kthread.h> #include <linux/vmalloc.h> +#include <linux/delay.h> static int qla24xx_vport_disable(struct fc_vport *, bool); |