Merge branch 'x86/asm' into x86/apic, to resolve a conflict
[cascardo/linux.git] / arch / arm / mach-qcom / Makefile
1 obj-y                   := board.o
2 obj-$(CONFIG_SMP)       += platsmp.o