diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 19:43:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 19:43:39 -0500 |
| commit | a25a2b84098eb5e001cb8086603d692aa95bf2ec (patch) | |
| tree | 02c01b36251f7b0afb1a98093e14efb17d015910 /security/integrity/Makefile | |
| parent | f429ee3b808118591d1f3cdf3c0d0793911a5677 (diff) | |
| parent | f1be242c95257b199d8b679bc952ca33487c9af6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
integrity: digital signature config option name change
lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
lib: MPILIB Kconfig description update
lib: digital signature dependency fix
lib: digital signature config option name change
encrypted-keys: fix rcu and sparse messages
keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
KEYS: Add missing smp_rmb() primitives to the keyring search code
TOMOYO: Accept \000 as a valid character.
security: update MAINTAINERS file with new git repo
Diffstat (limited to 'security/integrity/Makefile')
| -rw-r--r-- | security/integrity/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/Makefile b/security/integrity/Makefile index bece0563ee5e..d43799cc14f6 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_INTEGRITY) += integrity.o | 5 | obj-$(CONFIG_INTEGRITY) += integrity.o |
| 6 | obj-$(CONFIG_INTEGRITY_DIGSIG) += digsig.o | 6 | obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o |
| 7 | 7 | ||
| 8 | integrity-y := iint.o | 8 | integrity-y := iint.o |
| 9 | 9 | ||