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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
x86
/
lib
/
Makefile
diff --git
a/arch/x86/lib/Makefile
b/arch/x86/lib/Makefile
index
3ac4a8a
..
f871e04
100644
(file)
--- a/
arch/x86/lib/Makefile
+++ b/
arch/x86/lib/Makefile
@@
-20,7
+20,7
@@
lib-y := delay.o
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
-lib-$(CONFIG_
KPROBES
) += insn.o inat.o
+lib-$(CONFIG_
INSTRUCTION_DECODER
) += insn.o inat.o
obj-y += msr.o msr-reg.o msr-reg-export.o