summaryrefslogtreecommitdiff
path: root/arch/parisc/kernel/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-01-02 17:02:06 +0400
committerMichal Marek <mmarek@suse.cz>2014-01-02 17:02:06 +0400
commit37e2c2a775fc887acd1432908478dfd532f7f00f (patch)
treee51ebc699d8e262fd47e0913be6a711cb1a7b565 /arch/parisc/kernel/Makefile
parent1c8ddae09f4c102b97c9086cc70347e89468a547 (diff)
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
downloadlinux-37e2c2a775fc887acd1432908478dfd532f7f00f.tar.xz
Merge commit v3.13-rc1 into kbuild/misc
Diffstat (limited to 'arch/parisc/kernel/Makefile')
-rw-r--r--arch/parisc/kernel/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 66ee3f12df58..ff87b4603e3d 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -29,7 +29,9 @@ obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_64BIT) += binfmt_elf32.o sys_parisc32.o signal32.o
obj-$(CONFIG_STACKTRACE)+= stacktrace.o
+obj-$(CONFIG_AUDIT) += audit.o
+obj64-$(CONFIG_AUDIT) += compat_audit.o
# only supported for PCX-W/U in 64-bit mode at the moment
-obj-$(CONFIG_64BIT) += perf.o perf_asm.o
+obj-$(CONFIG_64BIT) += perf.o perf_asm.o $(obj64-y)
obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o