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/spi/spi_bitbang.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/spi/spi_bitbang.c')
| -rw-r--r-- | drivers/spi/spi_bitbang.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index 08c1c57c6128..57289b61d0be 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c | |||
| @@ -196,7 +196,7 @@ int spi_bitbang_setup(struct spi_device *spi) | |||
| 196 | return -EINVAL; | 196 | return -EINVAL; |
| 197 | 197 | ||
| 198 | if (!cs) { | 198 | if (!cs) { |
| 199 | cs = kzalloc(sizeof *cs, SLAB_KERNEL); | 199 | cs = kzalloc(sizeof *cs, GFP_KERNEL); |
| 200 | if (!cs) | 200 | if (!cs) |
| 201 | return -ENOMEM; | 201 | return -ENOMEM; |
| 202 | spi->controller_state = cs; | 202 | spi->controller_state = cs; |