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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
drivers
/
s390
/
crypto
/
zcrypt_pcicc.c
diff --git
a/drivers/s390/crypto/zcrypt_pcicc.c
b/drivers/s390/crypto/zcrypt_pcicc.c
index
aa4c050
..
bdbdbe1
100644
(file)
--- a/
drivers/s390/crypto/zcrypt_pcicc.c
+++ b/
drivers/s390/crypto/zcrypt_pcicc.c
@@
-30,7
+30,7
@@
#include <linux/init.h>
#include <linux/gfp.h>
#include <linux/err.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/uaccess.h>
#include "ap_bus.h"