diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /security/keys/Makefile | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'security/keys/Makefile')
| -rw-r--r-- | security/keys/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index c392d750b208..5145adfb6a05 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile | |||
| @@ -6,6 +6,7 @@ obj-y := \ | |||
| 6 | key.o \ | 6 | key.o \ |
| 7 | keyring.o \ | 7 | keyring.o \ |
| 8 | keyctl.o \ | 8 | keyctl.o \ |
| 9 | permission.o \ | ||
| 9 | process_keys.o \ | 10 | process_keys.o \ |
| 10 | request_key.o \ | 11 | request_key.o \ |
| 11 | request_key_auth.o \ | 12 | request_key_auth.o \ |