git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
Makefile
diff --git
a/arch/x86/kernel/Makefile
b/arch/x86/kernel/Makefile
index d87f09bc5a524952e7ff7f920f75306b2984c608..4c58352209e0e89114778a80f66e3025d315e670 100644
(file)
--- a/
arch/x86/kernel/Makefile
+++ b/
arch/x86/kernel/Makefile
@@
-87,6
+87,7
@@
obj-$(CONFIG_VM86) += vm86_32.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
+obj-$(CONFIG_APB_TIMER) += apb_timer.o
obj-$(CONFIG_K8_NB) += k8.o
obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o