diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
| commit | 53971a86d2db89f32859dc26bd6594b5bc665d5b (patch) | |
| tree | 350ee9f3d53494036308cd123054dac3ba86ff91 /arch/arm/kernel/Makefile | |
| parent | usb: dwc2: fix sparse warning (diff) | |
| parent | Linux 3.15-rc3 (diff) | |
| download | linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.xz linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.zip | |
Merge 3.15-rc3 into usb-next
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index a766bcbaf8ad..040619c32d68 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o +obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o |