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/core/message.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/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 7390b67c609..149aa8bfb1f 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
| @@ -488,7 +488,7 @@ void usb_sg_wait (struct usb_sg_request *io) | |||
| 488 | int retval; | 488 | int retval; |
| 489 | 489 | ||
| 490 | io->urbs [i]->dev = io->dev; | 490 | io->urbs [i]->dev = io->dev; |
| 491 | retval = usb_submit_urb (io->urbs [i], SLAB_ATOMIC); | 491 | retval = usb_submit_urb (io->urbs [i], GFP_ATOMIC); |
| 492 | 492 | ||
| 493 | /* after we submit, let completions or cancelations fire; | 493 | /* after we submit, let completions or cancelations fire; |
| 494 | * we handshake using io->status. | 494 | * we handshake using io->status. |