diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-07 03:26:43 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-07 03:26:43 +0200 |
| commit | cc25c8544e3b427dc25a825a6904e00a3170d001 (patch) | |
| tree | 79d681043f9a789ef1af4dc8d36e9301df889264 /ncr-key-wrap.c | |
| parent | 0970369455d02b2fe40567ac4cc93d1250b47bab (diff) | |
| parent | cb519ef9fc39d3ccb1272ec7685524443490ca54 (diff) | |
| download | kernel-crypto-cc25c8544e3b427dc25a825a6904e00a3170d001.tar.gz kernel-crypto-cc25c8544e3b427dc25a825a6904e00a3170d001.tar.xz kernel-crypto-cc25c8544e3b427dc25a825a6904e00a3170d001.zip | |
Merge branch 'bugfixes'
Conflicts:
ncr-int.h
Diffstat (limited to 'ncr-key-wrap.c')
| -rw-r--r-- | ncr-key-wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ncr-key-wrap.c b/ncr-key-wrap.c index d5d3df0fb43..0c56def27f7 100644 --- a/ncr-key-wrap.c +++ b/ncr-key-wrap.c @@ -22,13 +22,13 @@ * 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/highmem.h> #include <linux/random.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" |