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]
/
fs
/
nfs
/
direct.c
diff --git
a/fs/nfs/direct.c
b/fs/nfs/direct.c
index
b35d25b
..
1940f1a
100644
(file)
--- a/
fs/nfs/direct.c
+++ b/
fs/nfs/direct.c
@@
-53,7
+53,7
@@
#include <asm/system.h>
#include <asm/uaccess.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "internal.h"
#include "iostat.h"