aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 10:17:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-11 10:17:42 +0100
commitf437e8b53eab92a5829e65781e29aed23d8ffd0c (patch)
tree48982c8818a4ac5cddb84ca6a1d55620eb9680ee /fs/btrfs/ioctl.c
parentMerge branches 'sched/rt' and 'sched/urgent' into sched/core (diff)
parentLinux 2.6.29-rc4 (diff)
downloadwireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.tar.xz
wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.zip
Merge commit 'v2.6.29-rc4' into sched/core
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index c2aa33e3feb5..988fdc8b49eb 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -38,7 +38,6 @@
#include <linux/compat.h>
#include <linux/bit_spinlock.h>
#include <linux/security.h>
-#include <linux/version.h>
#include <linux/xattr.h>
#include <linux/vmalloc.h>
#include "compat.h"