From 45da96d5f89c6ebffb08f87591a193c760c9f1c5 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Tue, 17 Jan 2012 17:12:07 +0200
Subject: [PATCH] --- yaml --- r: 286084 b: refs/heads/master c:
 f1be242c95257b199d8b679bc952ca33487c9af6 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/security/integrity/Kconfig     | 2 +-
 trunk/security/integrity/Makefile    | 2 +-
 trunk/security/integrity/integrity.h | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4834da95806a..be927c335d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e5f094b9dbf9463ab93f86351cd1a8dc88942cc
+refs/heads/master: f1be242c95257b199d8b679bc952ca33487c9af6
diff --git a/trunk/security/integrity/Kconfig b/trunk/security/integrity/Kconfig
index ff60bf72881f..5bd1cc1b4a54 100644
--- a/trunk/security/integrity/Kconfig
+++ b/trunk/security/integrity/Kconfig
@@ -3,7 +3,7 @@ config INTEGRITY
 	def_bool y
 	depends on IMA || EVM
 
-config INTEGRITY_DIGSIG
+config INTEGRITY_SIGNATURE
 	boolean "Digital signature verification using multiple keyrings"
 	depends on INTEGRITY && KEYS
 	default n
diff --git a/trunk/security/integrity/Makefile b/trunk/security/integrity/Makefile
index bece0563ee5e..d43799cc14f6 100644
--- a/trunk/security/integrity/Makefile
+++ b/trunk/security/integrity/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-$(CONFIG_INTEGRITY) += integrity.o
-obj-$(CONFIG_INTEGRITY_DIGSIG) += digsig.o
+obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o
 
 integrity-y := iint.o
 
diff --git a/trunk/security/integrity/integrity.h b/trunk/security/integrity/integrity.h
index 4da6ba81d153..7a25ecec5aaa 100644
--- a/trunk/security/integrity/integrity.h
+++ b/trunk/security/integrity/integrity.h
@@ -51,7 +51,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode);
 #define INTEGRITY_KEYRING_IMA		2
 #define INTEGRITY_KEYRING_MAX		3
 
-#ifdef CONFIG_INTEGRITY_DIGSIG
+#ifdef CONFIG_INTEGRITY_SIGNATURE
 
 int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
 					const char *digest, int digestlen);
@@ -65,7 +65,7 @@ static inline int integrity_digsig_verify(const unsigned int id,
 	return -EOPNOTSUPP;
 }
 
-#endif /* CONFIG_INTEGRITY_DIGSIG */
+#endif /* CONFIG_INTEGRITY_SIGNATURE */
 
 /* set during initialization */
 extern int iint_initialized;