diff options
author | James Morris <jmorris@namei.org> | 2010-11-29 00:27:07 +0300 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-11-29 00:27:07 +0300 |
commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
tree | afb229254bed6415407b7b7d4641f9f792109966 /fs/read_write.c | |
parent | 074e61ec3751da9ab88ee66d3818574556c03489 (diff) | |
parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) | |
download | linux-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'fs/read_write.c')
-rw-r--r-- | fs/read_write.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 431a0ed610c8..5d431bacbea9 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -9,7 +9,6 @@ #include <linux/fcntl.h> #include <linux/file.h> #include <linux/uio.h> -#include <linux/smp_lock.h> #include <linux/fsnotify.h> #include <linux/security.h> #include <linux/module.h> |