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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
mce.h
diff --git
a/arch/x86/include/asm/mce.h
b/arch/x86/include/asm/mce.h
index
716b48a
..
c9321f3
100644
(file)
--- a/
arch/x86/include/asm/mce.h
+++ b/
arch/x86/include/asm/mce.h
@@
-124,7
+124,7
@@
extern struct atomic_notifier_head x86_mce_decoder_chain;
#include <linux/percpu.h>
#include <linux/init.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
extern int mce_disabled;
extern int mce_p5_enabled;