summaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorTrond Myklebust2006-07-03 19:49:45 +0200
committerTrond Myklebust2006-07-03 19:49:45 +0200
commit026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch)
tree2624a44924c625c367f3cebf937853b9da2de282 /fs/nfs/direct.c
parentMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadkernel-qcow2-linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.gz
kernel-qcow2-linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.xz
kernel-qcow2-linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 9ae7b6f6bf30..fecd3b095deb 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -38,7 +38,6 @@
*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>