diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 17:30:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 17:30:54 +0100 |
| commit | e9f2d6d66037cdf97487491e04053f411abc5d16 (patch) | |
| tree | 123cec080d17fb74a2531d8cc7ad1cf44bbad9ec /arch/arm/kernel/Makefile | |
| parent | Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next (diff) | |
| parent | Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/l... (diff) | |
| download | linux-e9f2d6d66037cdf97487491e04053f411abc5d16.tar.xz linux-e9f2d6d66037cdf97487491e04053f411abc5d16.zip | |
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 endif obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o obj-$(CONFIG_ARM_THUMBEE) += thumbee.o -obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_KGDB) += kgdb.o patch.o obj-$(CONFIG_ARM_UNWIND) += unwind.o obj-$(CONFIG_HAVE_TCM) += tcm.o obj-$(CONFIG_OF) += devtree.o |