diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/usb/input/touchkitusb.c | |
parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) |
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
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/usb/input/touchkitusb.c')
-rw-r--r-- | drivers/usb/input/touchkitusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c index 05c0d1ca39ab..2a314b065922 100644 --- a/drivers/usb/input/touchkitusb.c +++ b/drivers/usb/input/touchkitusb.c | |||
@@ -248,7 +248,7 @@ static int touchkit_alloc_buffers(struct usb_device *udev, | |||
248 | struct touchkit_usb *touchkit) | 248 | struct touchkit_usb *touchkit) |
249 | { | 249 | { |
250 | touchkit->data = usb_buffer_alloc(udev, TOUCHKIT_REPORT_DATA_SIZE, | 250 | touchkit->data = usb_buffer_alloc(udev, TOUCHKIT_REPORT_DATA_SIZE, |
251 | SLAB_ATOMIC, &touchkit->data_dma); | 251 | GFP_ATOMIC, &touchkit->data_dma); |
252 | 252 | ||
253 | if (!touchkit->data) | 253 | if (!touchkit->data) |
254 | return -1; | 254 | return -1; |