diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /drivers/scsi/qla2xxx/qla_attr.c | |
parent | sched: move sched_clock before first use (diff) | |
parent | Linux 2.6.27-rc1 (diff) | |
download | linux-6679ce6e5f519096612b480d255d9ca97be0c2be.tar.xz linux-6679ce6e5f519096612b480d255d9ca97be0c2be.zip |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_attr.c')
-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); |