diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 02:56:07 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 02:56:07 +0200 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /lib/crc32.c | |
| parent | TOMOYO: Use GFP_NOFS rather than GFP_KERNEL. (diff) | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| download | linux-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz linux-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.zip | |
Merge branch 'master' into next
Diffstat (limited to 'lib/crc32.c')
| -rw-r--r-- | lib/crc32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/crc32.c b/lib/crc32.c index 0f45fbff34cb..bc5b936e9142 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -25,7 +25,6 @@ #include <linux/module.h> #include <linux/compiler.h> #include <linux/types.h> -#include <linux/slab.h> #include <linux/init.h> #include <asm/atomic.h> #include "crc32defs.h" |