diff options
author | Chris Mason <chris.mason@oracle.com> | 2009-01-28 20:29:43 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-01-28 20:29:43 -0500 |
commit | e4f722fa42537bcb0ff14322a57dc3870d093cab (patch) | |
tree | 315920ade3b68bf20c4080bcd1bf2bc34a5d5ab7 /fs/btrfs/extent_map.c | |
parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
parent | a717531942f488209dded30f6bc648167bcefa72 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Fix fs/btrfs/super.c conflict around #includes
Diffstat (limited to 'fs/btrfs/extent_map.c')
-rw-r--r-- | fs/btrfs/extent_map.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 4a83e33ada3..50da69da20c 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -3,7 +3,6 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/spinlock.h> -#include <linux/version.h> #include <linux/hardirq.h> #include "extent_map.h" |