diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /lib/crc32.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'lib/crc32.c')
| -rw-r--r-- | lib/crc32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crc32.c b/lib/crc32.c index 4855995fcde9..a6e633a48cea 100644 --- a/lib/crc32.c +++ b/lib/crc32.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/compiler.h> | 26 | #include <linux/compiler.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <asm/atomic.h> | 29 | #include <linux/atomic.h> |
| 30 | #include "crc32defs.h" | 30 | #include "crc32defs.h" |
| 31 | #if CRC_LE_BITS == 8 | 31 | #if CRC_LE_BITS == 8 |
| 32 | # define tole(x) __constant_cpu_to_le32(x) | 32 | # define tole(x) __constant_cpu_to_le32(x) |