projects
/
powerpc.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/dtor/input
[powerpc.git]
/
drivers
/
s390
/
block
/
dcssblk.c
diff --git
a/drivers/s390/block/dcssblk.c
b/drivers/s390/block/dcssblk.c
index
4fde411
..
2e727f4
100644
(file)
--- a/
drivers/s390/block/dcssblk.c
+++ b/
drivers/s390/block/dcssblk.c
@@
-15,7
+15,7
@@
#include <asm/io.h>
#include <linux/completion.h>
#include <linux/interrupt.h>
#include <asm/io.h>
#include <linux/completion.h>
#include <linux/interrupt.h>
-#include <asm/
ccwdev.h> // for s390_root_dev_(un)register()
+#include <asm/
s390_rdev.h>
//#define DCSSBLK_DEBUG /* Debug messages on/off */
#define DCSSBLK_NAME "dcssblk"
//#define DCSSBLK_DEBUG /* Debug messages on/off */
#define DCSSBLK_NAME "dcssblk"