diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 20:33:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:24 -0800 |
| commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
| tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/usb/misc/phidgetmotorcontrol.c | |
| parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) | |
| download | linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.gz linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.bz2 linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.zip | |
[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/misc/phidgetmotorcontrol.c')
| -rw-r--r-- | drivers/usb/misc/phidgetmotorcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index 2bb4fa572bb7..5727e1ea2f91 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c @@ -151,7 +151,7 @@ static void motorcontrol_irq(struct urb *urb) schedule_delayed_work(&mc->do_notify, 0); resubmit: - status = usb_submit_urb(urb, SLAB_ATOMIC); + status = usb_submit_urb(urb, GFP_ATOMIC); if (status) dev_err(&mc->intf->dev, "can't resubmit intr, %s-%s/motorcontrol0, status %d", @@ -338,7 +338,7 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic goto out; mc->dev_no = -1; - mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &mc->data_dma); + mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, GFP_ATOMIC, &mc->data_dma); if (!mc->data) goto out; |