From: Mimi Zohar Date: Wed, 14 Sep 2011 19:06:00 +0000 (-0400) Subject: encrypted-keys: create encrypted-keys directory X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61cf45d0199041df1a8ba334b6bf4a3a13b7f904;p=linux-beck.git encrypted-keys: create encrypted-keys directory Move all files associated with encrypted keys to keys/encrypted-keys. Signed-off-by: Mimi Zohar --- diff --git a/security/keys/Makefile b/security/keys/Makefile index b34cc6ee6900..a56f1ffdc64d 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile @@ -14,7 +14,7 @@ obj-y := \ user_defined.o obj-$(CONFIG_TRUSTED_KEYS) += trusted.o -obj-$(CONFIG_ENCRYPTED_KEYS) += ecryptfs_format.o encrypted.o +obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/ obj-$(CONFIG_KEYS_COMPAT) += compat.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSCTL) += sysctl.o diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile new file mode 100644 index 000000000000..cbd3f8de37bb --- /dev/null +++ b/security/keys/encrypted-keys/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for encrypted keys +# + +obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o diff --git a/security/keys/ecryptfs_format.c b/security/keys/encrypted-keys/ecryptfs_format.c similarity index 100% rename from security/keys/ecryptfs_format.c rename to security/keys/encrypted-keys/ecryptfs_format.c diff --git a/security/keys/ecryptfs_format.h b/security/keys/encrypted-keys/ecryptfs_format.h similarity index 100% rename from security/keys/ecryptfs_format.h rename to security/keys/encrypted-keys/ecryptfs_format.h diff --git a/security/keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c similarity index 100% rename from security/keys/encrypted.c rename to security/keys/encrypted-keys/encrypted.c diff --git a/security/keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h similarity index 100% rename from security/keys/encrypted.h rename to security/keys/encrypted-keys/encrypted.h