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 branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_sup.c
diff --git
a/drivers/scsi/qla2xxx/qla_sup.c
b/drivers/scsi/qla2xxx/qla_sup.c
index 9f6012b78e565e3225e3e1f9b8a6f23e7eeef103..b4336e0cd85f077d4ebe241501b525a8810b7380 100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_sup.c
+++ b/
drivers/scsi/qla2xxx/qla_sup.c
@@
-9,7
+9,7
@@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
/*
* NVRAM support routines