From 83ce766a0a88a76f22c17df3b711160287dda5b5 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Thu, 22 Jul 2010 18:10:01 +0200
Subject: Modify public header files for include/linux

Use similar guard macros as other files, include <linux/types.h> for
the required types.
---
 include/linux/cryptodev.h | 12 ++++--------
 include/linux/ncr.h       |  9 +++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/include/linux/cryptodev.h b/include/linux/cryptodev.h
index 4d6b712e506..ce3840c6359 100644
--- a/include/linux/cryptodev.h
+++ b/include/linux/cryptodev.h
@@ -2,14 +2,10 @@
  * cryptodev by Angelos D. Keromytis, found at openbsd cryptodev.h.
  * Placed under public domain */
 
-#ifndef L_CRYPTODEV_H
-#define L_CRYPTODEV_H
+#ifndef _LINUX_CRYPTODEV_H
+#define _LINUX_CRYPTODEV_H
 
-#ifndef __KERNEL__
-#include <inttypes.h>
-#define __user
-#else
-#endif
+#include <linux/types.h>
 
 /* API extensions for linux */
 #define CRYPTO_HMAC_MAX_KEY_LEN		512
@@ -152,4 +148,4 @@ typedef enum {
 #define CIOCKEY         _IOWR('c', 105, struct crypt_kop)
 #define CIOCASYMFEAT    _IOR('c', 106, uint32_t)
 
-#endif /* L_CRYPTODEV_H */
+#endif /* _LINUX_CRYPTODEV_H */
diff --git a/include/linux/ncr.h b/include/linux/ncr.h
index 30158897fb3..47b03015f6b 100644
--- a/include/linux/ncr.h
+++ b/include/linux/ncr.h
@@ -1,10 +1,7 @@
-#ifndef L_NCR_H
-#define L_NCR_H
+#ifndef _LINUX_NCR_H
+#define _LINUX_NCR_H
 
-#ifndef __KERNEL__
-#include <inttypes.h>
-#define __user
-#endif
+#include <linux/types.h>
 
 #define NCR_CIPHER_MAX_BLOCK_LEN 32
 #define NCR_CIPHER_MAX_KEY_LEN 64
-- 
cgit