Merge by hand (conflicts between pending drivers and kfree cleanups)

[karo-tx-linux.git] / fs / jffs2 / histo.h

diff --git a/fs/jffs2/histo.h b/fs/jffs2/histo.h
index 84f184f0836f2aab1b9514336f5d3bb75aea6fd5..22a93a08210c060f47dd2b71674b391b4ea27897 100644 (file)
--- a/fs/jffs2/histo.h
+++ b/fs/jffs2/histo.h
@@ -1,3 +1,3 @@
 /* This file provides the bit-probabilities for the input file */
-#define BIT_DIVIDER 629 
+#define BIT_DIVIDER 629
 static int bits[9] = { 179,167,183,165,159,198,178,119,}; /* ia32 .so files */