projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
[cascardo/linux.git]
/
arch
/
x86
/
ras
/
Makefile
diff --git
a/arch/x86/ras/Makefile
b/arch/x86/ras/Makefile
index
dd2c98b
..
5f94546
100644
(file)
--- a/
arch/x86/ras/Makefile
+++ b/
arch/x86/ras/Makefile
@@
-1,2
+1,2
@@
-obj-$(CONFIG_
AMD_MCE
_INJ) += mce_amd_inj.o
+obj-$(CONFIG_
MCE_AMD
_INJ) += mce_amd_inj.o