Update for public headers moved to include/linux

12 files changed, 20 insertions, 20 deletions

diff --git a/crypto/userspace/cryptodev_cipher.c b/crypto/userspace/cryptodev_cipher.c
index fa5aab28942..da111c76981 100644
--- a/crypto/userspace/cryptodev_cipher.c
+++ b/crypto/userspace/cryptodev_cipher.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/crypto.h>
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/random.h>
@@ -28,7 +29,6 @@
 #include <linux/scatterlist.h>
 #include <crypto/algapi.h>
 #include <crypto/hash.h>
-#include "cryptodev.h"
 #include "cryptodev_int.h"
 
 
diff --git a/crypto/userspace/cryptodev_int.h b/crypto/userspace/cryptodev_int.h
index d12fd4f80e7..2cd7b2eef95 100644
--- a/crypto/userspace/cryptodev_int.h
+++ b/crypto/userspace/cryptodev_int.h
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/scatterlist.h>
-#include <cryptodev.h>
+#include <linux/cryptodev.h>
 
 #define PFX "cryptodev: "
 #define dprintk(level,severity,format,a...)			\
diff --git a/crypto/userspace/cryptodev_main.c b/crypto/userspace/cryptodev_main.c
index 5ab11362115..e8830bff5f0 100644
--- a/crypto/userspace/cryptodev_main.c
+++ b/crypto/userspace/cryptodev_main.c
@@ -31,12 +31,12 @@
  */
 
 #include <linux/crypto.h>
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/random.h>
 #include <linux/syscalls.h>
 #include <linux/pagemap.h>
-#include "cryptodev.h"
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
diff --git a/crypto/userspace/ncr-data.c b/crypto/userspace/ncr-data.c
index 73ee7370329..5aee49ed456 100644
--- a/crypto/userspace/ncr-data.c
+++ b/crypto/userspace/ncr-data.c
@@ -20,13 +20,13 @@
  */
 
 #include <linux/crypto.h>
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
-#include "cryptodev.h"
+#include <linux/ncr.h>
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
-#include "ncr.h"
 #include "ncr_int.h"
 
 /* must be called with data semaphore down */
diff --git a/crypto/userspace/ncr-key-storage.c b/crypto/userspace/ncr-key-storage.c
index ca96ddb3d86..1f94fa075b7 100644
--- a/crypto/userspace/ncr-key-storage.c
+++ b/crypto/userspace/ncr-key-storage.c
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
-#include "cryptodev.h"
+#include <linux/ncr.h>
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
-#include "ncr.h"
 #include "ncr_int.h"
 #include "cryptodev_int.h"
 
diff --git a/crypto/userspace/ncr-key-wrap.c b/crypto/userspace/ncr-key-wrap.c
index 67fe10df7f8..a96bad9178f 100644
--- a/crypto/userspace/ncr-key-wrap.c
+++ b/crypto/userspace/ncr-key-wrap.c
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
+#include <linux/ncr.h>
 #include <linux/highmem.h>
 #include <linux/random.h>
-#include "cryptodev.h"
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
-#include "ncr.h"
 #include "ncr_int.h"
 #include "cryptodev_int.h"
 
diff --git a/crypto/userspace/ncr-key.c b/crypto/userspace/ncr-key.c
index 18cb38718a3..96b80cf27be 100644
--- a/crypto/userspace/ncr-key.c
+++ b/crypto/userspace/ncr-key.c
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
+#include <linux/ncr.h>
 #include <linux/random.h>
-#include "cryptodev.h"
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
-#include "ncr.h"
 #include "ncr_int.h"
 
 static void ncr_key_clear(struct key_item_st* item);
diff --git a/crypto/userspace/ncr-limits.c b/crypto/userspace/ncr-limits.c
index 746434c5d1b..472f5cee33b 100644
--- a/crypto/userspace/ncr-limits.c
+++ b/crypto/userspace/ncr-limits.c
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cryptodev.h>
 #include <linux/types.h>
 #include <linux/mm.h>
+#include <linux/ncr.h>
 #include <linux/highmem.h>
 #include <linux/random.h>
-#include "cryptodev.h"
 #include <asm/atomic.h>
 #include <linux/version.h>
 #include <linux/file.h>
 #include <linux/cred.h>
-#include "ncr.h"
 #include "ncr_int.h"
 
 /* arbitrary now */
diff --git a/crypto/userspace/ncr-pk.c b/crypto/userspace/ncr-pk.c
index 6b304bbb697..02c3841875f 100644
--- a/crypto/userspace/ncr-pk.c
+++ b/crypto/userspace/ncr-pk.c
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
+#include <linux/ncr.h>
 #include <linux/random.h>
-#include "cryptodev.h"
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
-#include "ncr.h"
 #include "ncr_int.h"
 #include <tomcrypt.h>
 
diff --git a/crypto/userspace/ncr-sessions.c b/crypto/userspace/ncr-sessions.c
index 45cd337a820..92e246615a6 100644
--- a/crypto/userspace/ncr-sessions.c
+++ b/crypto/userspace/ncr-sessions.c
@@ -20,8 +20,8 @@
  */
 
 #include <linux/crypto.h>
-#include "cryptodev.h"
-#include "ncr.h"
+#include <linux/cryptodev.h>
+#include <linux/ncr.h>
 #include "ncr_int.h"
 
 static void _ncr_session_remove(struct list_sem_st* lst, ncr_session_t desc);
diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c
index be0cdc89be2..e1e79ea7982 100644
--- a/crypto/userspace/ncr.c
+++ b/crypto/userspace/ncr.c
@@ -20,16 +20,16 @@
  */
 
 #include <linux/crypto.h>
+#include <linux/cryptodev.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/random.h>
-#include "cryptodev.h"
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
 #include <linux/scatterlist.h>
 #include <linux/cred.h>  
 #include <linux/capability.h>
-#include "ncr.h"
+#include <linux/ncr.h>
 #include "ncr_int.h"
 #include <linux/workqueue.h>
 
diff --git a/crypto/userspace/ncr_int.h b/crypto/userspace/ncr_int.h
index c5be7e52ec5..310b8c85b49 100644
--- a/crypto/userspace/ncr_int.h
+++ b/crypto/userspace/ncr_int.h
@@ -1,7 +1,7 @@
 #ifndef NCR_INT_H
 # define NCR_INT_H
 
-#include "ncr.h"
+#include <linux/ncr.h>
 #include <asm/atomic.h>
 #include "cryptodev_int.h"
 #include <ncr-pk.h>