Merge branch 'x86/asm' into x86/apic, to resolve a conflict
[linux-2.6-block.git] / arch / arm / mach-alpine / Makefile
1 obj-y                           += alpine_machine.o
2 obj-$(CONFIG_SMP)               += platsmp.o alpine_cpu_pm.o