Merge commit 'v3.6-rc1' into linux-next

[~andy/linux] / lib / crc32.c

diff --git a/lib/crc32.c b/lib/crc32.c
index b0d278fb1d911a5112db498873071cd64c368ad4..61774b8db4de6911453ccd383df7d38dd2f2b42f 100644 (file)
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -74,7 +74,9 @@ crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 (*tab)[256])
        size_t i;
 # endif
        const u32 *t0=tab[0], *t1=tab[1], *t2=tab[2], *t3=tab[3];
+# if CRC_LE_BITS != 32
        const u32 *t4 = tab[4], *t5 = tab[5], *t6 = tab[6], *t7 = tab[7];
+# endif
        u32 q;
 
        /* Align it */