diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /drivers/scsi | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/scsi')
| -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 | ||