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/net/net1080.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/net/net1080.c')
| -rw-r--r-- | drivers/usb/net/net1080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c index a77410562e12..493635954513 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/usb/net/net1080.c | |||
| @@ -383,7 +383,7 @@ static void nc_ensure_sync(struct usbnet *dev) | |||
| 383 | int status; | 383 | int status; |
| 384 | 384 | ||
| 385 | /* Send a flush */ | 385 | /* Send a flush */ |
| 386 | urb = usb_alloc_urb(0, SLAB_ATOMIC); | 386 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
| 387 | if (!urb) | 387 | if (!urb) |
| 388 | return; | 388 | return; |
| 389 | 389 | ||