diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 13:17:52 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 13:17:52 (GMT) |
| commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
| tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /kernel/Makefile | |
| parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
| parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) | |
| download | linux-fsl-qoriq-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.xz | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index c53e491..0b72d1a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -70,10 +70,11 @@ obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o obj-$(CONFIG_SMP) += stop_machine.o obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o -obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o +obj-$(CONFIG_AUDIT) += audit.o auditfilter.o obj-$(CONFIG_AUDITSYSCALL) += auditsc.o -obj-$(CONFIG_GCOV_KERNEL) += gcov/ +obj-$(CONFIG_AUDIT_WATCH) += audit_watch.o obj-$(CONFIG_AUDIT_TREE) += audit_tree.o +obj-$(CONFIG_GCOV_KERNEL) += gcov/ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_KGDB) += debug/ obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o |