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 commit 'remotes/tip/x86/paravirt' into x86/untangle2
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
msr.c
diff --git
a/arch/x86/kernel/msr.c
b/arch/x86/kernel/msr.c
index
7262666
..
3cf3413
100644
(file)
--- a/
arch/x86/kernel/msr.c
+++ b/
arch/x86/kernel/msr.c
@@
-35,10
+35,10
@@
#include <linux/device.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
+#include <linux/uaccess.h>
#include <asm/processor.h>
#include <asm/msr.h>
-#include <asm/uaccess.h>
#include <asm/system.h>
static struct class *msr_class;