aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 18:13:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 18:13:48 -0700
commita3ad7f128c637b7612ebeacb1f85fec933bb1195 (patch)
treebbfe3773752cb483c55a4701fa954caf09933049
parent9b79022ca909b66e2cd0cfd9248f832fc165f77f (diff)
parent00eabe7c4478f38b42d632763c4878ced5a1f25c (diff)
downloadlinux-2.6.34-ux500-a3ad7f128c637b7612ebeacb1f85fec933bb1195.tar.gz
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 7a4409ab30e..a319a20ed44 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);