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/ieee1394/pcilynx.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/ieee1394/pcilynx.c')
-rw-r--r-- | drivers/ieee1394/pcilynx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 0a7412e27eb4..9cab1d661472 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
@@ -1428,7 +1428,7 @@ static int __devinit add_card(struct pci_dev *dev, | |||
1428 | struct i2c_algo_bit_data i2c_adapter_data; | 1428 | struct i2c_algo_bit_data i2c_adapter_data; |
1429 | 1429 | ||
1430 | error = -ENOMEM; | 1430 | error = -ENOMEM; |
1431 | i2c_ad = kmalloc(sizeof(*i2c_ad), SLAB_KERNEL); | 1431 | i2c_ad = kmalloc(sizeof(*i2c_ad), GFP_KERNEL); |
1432 | if (!i2c_ad) FAIL("failed to allocate I2C adapter memory"); | 1432 | if (!i2c_ad) FAIL("failed to allocate I2C adapter memory"); |
1433 | 1433 | ||
1434 | memcpy(i2c_ad, &bit_ops, sizeof(struct i2c_adapter)); | 1434 | memcpy(i2c_ad, &bit_ops, sizeof(struct i2c_adapter)); |