git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
s390
/
cio
/
qdio_main.c
diff --git
a/drivers/s390/cio/qdio_main.c
b/drivers/s390/cio/qdio_main.c
index
570d4da
..
e58169c
100644
(file)
--- a/
drivers/s390/cio/qdio_main.c
+++ b/
drivers/s390/cio/qdio_main.c
@@
-15,7
+15,7
@@
#include <linux/delay.h>
#include <linux/gfp.h>
#include <linux/kernel_stat.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/debug.h>
#include <asm/qdio.h>