diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 22:43:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 22:43:17 +0400 |
| commit | 05ff0e291af086f4325bac76abad250690bbbd63 (patch) | |
| tree | 3ea47e8ef5bebc1261302e3d0775414fb78037c4 /arch/powerpc/kernel/Makefile | |
| parent | 5eea7ee2075b245d505285bb422e2fa8d686e5c8 (diff) | |
| parent | 55669bfa141b488be865341ed12e188967d11308 (diff) | |
| download | linux-05ff0e291af086f4325bac76abad250690bbbd63.tar.xz | |
Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] audit: AUDIT_PERM support
[PATCH] audit: more syscall classes added
[PATCH] syscall classes hookup for ppc and s390
[PATCH] update audit rule change messages
[PATCH] sanity check audit_buffer
[PATCH] fix ppid bug in 2.6.18 kernel
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 956c2e5564b7..7d32ad0194a4 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -70,6 +70,8 @@ obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y) kexec-$(CONFIG_PPC64) := machine_kexec_64.o kexec-$(CONFIG_PPC32) := machine_kexec_32.o obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y) +obj-$(CONFIG_AUDIT) += audit.o +obj64-$(CONFIG_AUDIT) += compat_audit.o ifeq ($(CONFIG_PPC_ISERIES),y) $(obj)/head_64.o: $(obj)/lparmap.s |