git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_attr.c
diff --git
a/drivers/scsi/qla2xxx/qla_attr.c
b/drivers/scsi/qla2xxx/qla_attr.c
index 35a325266afaecd0f82a9c75e52bb40ec48ddd17..359e9a71a021498ddf1211b826ac65ef9e673cec 100644
(file)
--- 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/slab.h>
#include <linux/delay.h>
static int qla24xx_vport_disable(struct fc_vport *, bool);