diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
| commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
| tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/mtd/devices/m25p80.c | |
| parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) | |
[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>
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index ef4a731ca5c2..334e078ffaff 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -451,7 +451,7 @@ static int __devinit m25p_probe(struct spi_device *spi) | |||
| 451 | return -ENODEV; | 451 | return -ENODEV; |
| 452 | } | 452 | } |
| 453 | 453 | ||
| 454 | flash = kzalloc(sizeof *flash, SLAB_KERNEL); | 454 | flash = kzalloc(sizeof *flash, GFP_KERNEL); |
| 455 | if (!flash) | 455 | if (!flash) |
| 456 | return -ENOMEM; | 456 | return -ENOMEM; |
| 457 | 457 | ||