diff options
| author |   Christoph Lameter <clameter@sgi.com> | 2006-12-06 20:33:17 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:24 -0800 |
| commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
| tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/input/touchscreen/ads7846.c | |
| parent | [PATCH] slab: remove SLAB_ATOMIC (diff) | |
| download | linux-dev-e94b1766097d53e6f3ccfb36c8baa562ffeda3fc.tar.xz linux-dev-e94b1766097d53e6f3ccfb36c8baa562ffeda3fc.zip | |
[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/input/touchscreen/ads7846.c')
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index f56d6a0f0624..0517c7387d67 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -189,7 +189,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command) { struct spi_device *spi = to_spi_device(dev); struct ads7846 *ts = dev_get_drvdata(dev); - struct ser_req *req = kzalloc(sizeof *req, SLAB_KERNEL); + struct ser_req *req = kzalloc(sizeof *req, GFP_KERNEL); int status; int sample; int i; |