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/xpad.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/xpad.c')
-rw-r--r-- | drivers/usb/input/xpad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index df97e5c803f9..e4bc76ebc835 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
@@ -325,7 +325,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
325 | goto fail1; | 325 | goto fail1; |
326 | 326 | ||
327 | xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, | 327 | xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, |
328 | SLAB_ATOMIC, &xpad->idata_dma); | 328 | GFP_ATOMIC, &xpad->idata_dma); |
329 | if (!xpad->idata) | 329 | if (!xpad->idata) |
330 | goto fail1; | 330 | goto fail1; |
331 | 331 | ||