diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 11:22:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 11:22:34 -0700 |
| commit | 81e4e1ba7ed4a1fdcf0e2ee944f1575010471464 (patch) | |
| tree | a97bd3c8ec33dd18598169db83555bf5bd237b91 /fs | |
| parent | 373c0a7ed3ea3b34efedb7c83ffb521adff7c894 (diff) | |
| download | op-kernel-dev-81e4e1ba7ed4a1fdcf0e2ee944f1575010471464.zip op-kernel-dev-81e4e1ba7ed4a1fdcf0e2ee944f1575010471464.tar.gz | |
Revert "fuse: Fix build error" as unnecessary
This reverts commit 097041e576ee3a50d92dd643ee8ca65bf6a62e21.
Trond had a better fix, which is the parent of this one ("Fix compile
error due to congestion_wait() changes")
Requested-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/dev.c | 1 | ||||
| -rw-r--r-- | fs/nfs/write.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index cbceacbc..6484eb7 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -16,7 +16,6 @@ #include <linux/pagemap.h> #include <linux/file.h> #include <linux/slab.h> -#include <linux/blkdev.h> MODULE_ALIAS_MISCDEV(FUSE_MINOR); diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 35d8131..0a0a2ff 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -19,7 +19,6 @@ #include <linux/nfs_mount.h> #include <linux/nfs_page.h> #include <linux/backing-dev.h> -#include <linux/blkdev.h> #include <asm/uaccess.h> |
