summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/compression.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-22 17:59:49 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-22 17:59:49 +0100
commit2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch)
treec1e9868a4b91beeebd5f4e820588bc2ae8371911 /fs/btrfs/compression.c
parent42bb8cc5e81028e217105299001070d57eb84ad7 (diff)
parentadfafefd104d840ee4461965f22624d77532675b (diff)
downloadkernel-crypto-2702e0a46c2d28da92b32c9b068ee1291fc0de35.tar.gz
kernel-crypto-2702e0a46c2d28da92b32c9b068ee1291fc0de35.tar.xz
kernel-crypto-2702e0a46c2d28da92b32c9b068ee1291fc0de35.zip
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'fs/btrfs/compression.c')
-rw-r--r--fs/btrfs/compression.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index ee848d8585d..ab07627084f 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -32,7 +32,6 @@
#include <linux/swap.h>
#include <linux/writeback.h>
#include <linux/bit_spinlock.h>
-#include <linux/version.h>
#include <linux/pagevec.h>
#include "compat.h"
#include "ctree.h"