Merge branch 'bugfixes'

Conflicts:
	ncr-int.h

1 files changed, 2 insertions, 2 deletions

diff --git a/ncr.c b/ncr.c
index d4eb83fb2b0..86c8c7ad8ad 100644
--- a/ncr.c
+++ b/ncr.c
@@ -23,12 +23,12 @@
  */
 
 #include <linux/crypto.h>
+#include <linux/ioctl.h>
 #include <linux/mm.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 <linux/cred.h>  
 #include <linux/capability.h>