projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'driver-core-next' into Linux 3.2
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
mce.h
diff --git
a/arch/x86/include/asm/mce.h
b/arch/x86/include/asm/mce.h
index
0e8ae57
..
7f06a19
100644
(file)
--- a/
arch/x86/include/asm/mce.h
+++ b/
arch/x86/include/asm/mce.h
@@
-149,7
+149,7
@@
static inline void enable_p5_mce(void) {}
void mce_setup(struct mce *m);
void mce_log(struct mce *m);
-DECLARE_PER_CPU(struct
sys_device, mce_sysdev
);
+DECLARE_PER_CPU(struct
device, mce_device
);
/*
* Maximum banks number.