git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
Makefile
diff --git
a/arch/arm/mach-vexpress/Makefile
b/arch/arm/mach-vexpress/Makefile
index
1b71b77
..
2c0ac7d
100644
(file)
--- a/
arch/arm/mach-vexpress/Makefile
+++ b/
arch/arm/mach-vexpress/Makefile
@@
-5,4
+5,5
@@
obj-y := v2m.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o