diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
| commit | 5f07aa7524e98d6f68f2bec54f155ef6012e2c9a (patch) | |
| tree | 393b2db3213e6618ad1338f9b66019b0c05c6f75 /arch/powerpc/lib/Makefile | |
| parent | e467e104bb7482170b79f516d2025e7cfcaaa733 (diff) | |
| parent | d09ec7387184eba9e3030496f0451204090ff610 (diff) | |
| download | blackbird-op-linux-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.tar.gz blackbird-op-linux-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.zip | |
Merge commit 'paulus-perf/master' into next
Diffstat (limited to 'arch/powerpc/lib/Makefile')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 111da1c03a11..5bb89c828070 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -18,8 +18,9 @@ obj-$(CONFIG_HAS_IOMEM) += devres.o obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ memcpy_64.o usercopy_64.o mem_64.o string.o -obj-$(CONFIG_XMON) += sstep.o -obj-$(CONFIG_KPROBES) += sstep.o +obj-$(CONFIG_XMON) += sstep.o ldstfp.o +obj-$(CONFIG_KPROBES) += sstep.o ldstfp.o +obj-$(CONFIG_HAVE_HW_BREAKPOINT) += sstep.o ldstfp.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o |
