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 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
Makefile
diff --git
a/arch/x86/kernel/Makefile
b/arch/x86/kernel/Makefile
index
e77b220
..
0925676
100644
(file)
--- a/
arch/x86/kernel/Makefile
+++ b/
arch/x86/kernel/Makefile
@@
-104,6
+104,7
@@
obj-$(CONFIG_SCx200) += scx200.o
scx200-y += scx200_32.o
obj-$(CONFIG_OLPC) += olpc.o
+obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o
obj-$(CONFIG_X86_MRST) += mrst.o
microcode-y := microcode_core.o