git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
kernel
/
osf_sys.c
diff --git
a/arch/alpha/kernel/osf_sys.c
b/arch/alpha/kernel/osf_sys.c
index 56e427c7aa3c03d4e1e0547c71ea201dcaaa2006..54d8616644e2dfd510846b30b52e2b7e21c1c888 100644
(file)
--- a/
arch/alpha/kernel/osf_sys.c
+++ b/
arch/alpha/kernel/osf_sys.c
@@
-39,7
+39,7
@@
#include <asm/fpu.h>
#include <asm/io.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <asm/sysinfo.h>
#include <asm/thread_info.h>
#include <asm/hwrpb.h>