From 4e109ac04b9fccfc6d6bba44a5091ebb1c237db1 Mon Sep 17 00:00:00 2001
From: Eivind Uggedal <eivind@uggedal.com>
Date: Wed, 27 Aug 2014 07:23:28 +0000
Subject: main/btrfs-progs: upgrade to 3.16

---
 main/btrfs-progs/includes.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'main/btrfs-progs/includes.patch')

diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index ae69dae492..393399a999 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -12,8 +12,8 @@ index 323c571..7f30b06 100644
  
  /**
   * __ffs - find first bit in word.
-diff --git a/kerncompat.h b/kerncompat.h
-index 1fc2b34..e7d3ca5 100644
+diff --git a/kerncompat.h.orig b/kerncompat.h
+index bb03194e127e..28f832a2e625 100644
 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -28,6 +28,7 @@
@@ -21,6 +21,6 @@ index 1fc2b34..e7d3ca5 100644
  #include <stddef.h>
  #include <linux/types.h>
 +#include <linux/limits.h>
+ #include <stdint.h>
  
- #ifndef READ
- #define READ 0
+ #define ptr_to_u64(x)	((u64)(uintptr_t)x)
-- 
cgit v1.2.3