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 tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airli...
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
sx8.c
diff --git
a/drivers/block/sx8.c
b/drivers/block/sx8.c
index ba4bfe933276e34310a4208a10eb2e364dfefa7e..0e93ad7b851160540b25c068e5314f107dad2964 100644
(file)
--- a/
drivers/block/sx8.c
+++ b/
drivers/block/sx8.c
@@
-29,7
+29,7
@@
#include <linux/completion.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
#include <linux/completion.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#if 0
#define CARM_DEBUG
#if 0
#define CARM_DEBUG