Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[~andy/linux] / fs / btrfs / hash.h

diff --git a/fs/btrfs/hash.h b/fs/btrfs/hash.h
index 2a020b2767683238bbb1faafa18f0cbb9a20dd53..db2ff9773b99d02300e84f4bec207f59c65e73ef 100644 (file)
--- a/fs/btrfs/hash.h
+++ b/fs/btrfs/hash.h
@@ -19,9 +19,9 @@
 #ifndef __HASH__
 #define __HASH__
 
-#include "crc32c.h"
+#include <linux/crc32c.h>
 static inline u64 btrfs_name_hash(const char *name, int len)
 {
-       return btrfs_crc32c((u32)~1, name, len);
+       return crc32c((u32)~1, name, len);
 }
 #endif