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 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
cciss.c
diff --git
a/drivers/block/cciss.c
b/drivers/block/cciss.c
index db9d6bb6352d97a0a2cc9099a16317227edca96f..e5c5b8eb14a9bc4aaea939b955cd89c91946e98c 100644
(file)
--- a/
drivers/block/cciss.c
+++ b/
drivers/block/cciss.c
@@
-43,7
+43,7
@@
#include <linux/mutex.h>
#include <linux/bitmap.h>
#include <linux/io.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <linux/dma-mapping.h>
#include <linux/blkdev.h>