diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-09 16:01:40 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-09 16:01:40 +1000 |
| commit | a12e4537ada6cbe0730cb0c5cf8ed5ff687e2c06 (patch) | |
| tree | 4dac427bef6f88bfde344615bac0d4875b775c78 /arch/powerpc/perf/Makefile | |
| parent | b7bc9e7d808ba55729bd263b0210cda36965be32 (diff) | |
| parent | c8db32c8669f7de05b820ee4934926405af52188 (diff) | |
Merge remote-tracking branch 'scott/next' into next
Merge some Freescale updates from Scott Wood
Diffstat (limited to 'arch/powerpc/perf/Makefile')
| -rw-r--r-- | arch/powerpc/perf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/perf/Makefile b/arch/powerpc/perf/Makefile index 510fae10513d..60d71eea919c 100644 --- a/arch/powerpc/perf/Makefile +++ b/arch/powerpc/perf/Makefile @@ -9,7 +9,7 @@ obj64-$(CONFIG_PPC_PERF_CTRS) += power4-pmu.o ppc970-pmu.o power5-pmu.o \ obj32-$(CONFIG_PPC_PERF_CTRS) += mpc7450-pmu.o obj-$(CONFIG_FSL_EMB_PERF_EVENT) += core-fsl-emb.o -obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o +obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o e6500-pmu.o obj-$(CONFIG_PPC64) += $(obj64-y) obj-$(CONFIG_PPC32) += $(obj32-y) |