commit e94b1766097d53e6f3ccfb36c8baa562ffeda3fc
author Christoph Lameter <clameter@sgi.com> Wed Dec 06 20:33:17 2006 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> Thu Dec 07 08:39:24 2006 -0800
tree 93fa0a8ab84976d4e89c50768ca8b8878d642a0d
parent 54e6ecb23951b195d02433a741c7f7cb0b796c78

[PATCH] slab: remove SLAB_KERNEL

SLAB_KERNEL is an alias of GFP_KERNEL.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/mtd/devices/m25p80.c

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index ef4a731..334e078f 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -451,7 +451,7 @@
 		return -ENODEV;
 	}
 
-	flash = kzalloc(sizeof *flash, SLAB_KERNEL);
+	flash = kzalloc(sizeof *flash, GFP_KERNEL);
 	if (!flash)
 		return -ENOMEM;