diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-08 02:31:24 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-08 02:31:24 +0200 |
| commit | d465b18ea8d04ae3fce2e27016de8d3cdcc571e2 (patch) | |
| tree | 3f7555e9d838ef60f78df90e307f020e3b264099 /crypto/userspace/ncr-key-storage.c | |
| parent | 7494e29338fedcfeb5ed1e31eefe5742b786a2be (diff) | |
| parent | ad039cdd4a9c15df11f0e7ed730d4c176e3f8e1a (diff) | |
| download | kernel-crypto-d465b18ea8d04ae3fce2e27016de8d3cdcc571e2.tar.gz kernel-crypto-d465b18ea8d04ae3fce2e27016de8d3cdcc571e2.tar.xz kernel-crypto-d465b18ea8d04ae3fce2e27016de8d3cdcc571e2.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
examples/cipher.c
examples/hmac.c
examples/ncr.c
examples/pk.c
userspace/setkey.c
Diffstat (limited to 'crypto/userspace/ncr-key-storage.c')
| -rw-r--r-- | crypto/userspace/ncr-key-storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/userspace/ncr-key-storage.c b/crypto/userspace/ncr-key-storage.c index 41e52b77638..fc6948f5c61 100644 --- a/crypto/userspace/ncr-key-storage.c +++ b/crypto/userspace/ncr-key-storage.c @@ -22,11 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "ncr.h" #include "ncr-int.h" |