diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 11:30:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 11:30:54 -0500 |
| commit | e9f2d6d66037cdf97487491e04053f411abc5d16 (patch) | |
| tree | 123cec080d17fb74a2531d8cc7ad1cf44bbad9ec /arch/arm/kernel/Makefile | |
| parent | fbe4dd088f449cbae586aa8af51d271297c75f9f (diff) | |
| parent | 06e944b8e5fc4bec83f102f98c1ee4f972f5f072 (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 64886387c0bf..2ac3920e1793 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
| @@ -68,7 +68,7 @@ test-kprobes-objs += kprobes-test-arm.o | |||
| 68 | endif | 68 | endif |
| 69 | obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o | 69 | obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o |
| 70 | obj-$(CONFIG_ARM_THUMBEE) += thumbee.o | 70 | obj-$(CONFIG_ARM_THUMBEE) += thumbee.o |
| 71 | obj-$(CONFIG_KGDB) += kgdb.o | 71 | obj-$(CONFIG_KGDB) += kgdb.o patch.o |
| 72 | obj-$(CONFIG_ARM_UNWIND) += unwind.o | 72 | obj-$(CONFIG_ARM_UNWIND) += unwind.o |
| 73 | obj-$(CONFIG_HAVE_TCM) += tcm.o | 73 | obj-$(CONFIG_HAVE_TCM) += tcm.o |
| 74 | obj-$(CONFIG_OF) += devtree.o | 74 | obj-$(CONFIG_OF) += devtree.o |