projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[linux-2.6]
/
arch
/
arm
/
mach-realview
/
Makefile
diff --git
a/arch/arm/mach-realview/Makefile
b/arch/arm/mach-realview/Makefile
index
011a85c
..
ca1e390
100644
(file)
--- a/
arch/arm/mach-realview/Makefile
+++ b/
arch/arm/mach-realview/Makefile
@@
-4,4
+4,5
@@
obj-y := core.o clock.o
obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o
-obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o