summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/hashes.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 20:17:05 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 20:17:05 +0100
commit70c07e02625ec46d0ffbfce1acef42d660803528 (patch)
treef500f1a4f93e72747fb08b0eefabb167dcdc5db9 /fs/reiserfs/hashes.c
parentMerge branch 'master' (diff)
parentMerge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (diff)
downloadlinux-70c07e02625ec46d0ffbfce1acef42d660803528.tar.xz
linux-70c07e02625ec46d0ffbfce1acef42d660803528.zip
Merge branch 'viro'
Diffstat (limited to 'fs/reiserfs/hashes.c')
-rw-r--r--fs/reiserfs/hashes.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/reiserfs/hashes.c b/fs/reiserfs/hashes.c
index a3ec238fd9e0..e664ac16fad9 100644
--- a/fs/reiserfs/hashes.c
+++ b/fs/reiserfs/hashes.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/reiserfs_fs.h>
#include <asm/types.h>
-#include <asm/bug.h>
#define DELTA 0x9E3779B9
#define FULLROUNDS 10 /* 32 is overkill, 16 is strong crypto */