summaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/net1080.c
diff options
context:
space:
mode:
authorChristoph Lameter2006-12-07 05:33:16 +0100
committerLinus Torvalds2006-12-07 17:39:24 +0100
commit54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch)
treec8885c49f37c8d383945b8af69d51597494ed62c /drivers/usb/net/net1080.c
parent[PATCH] slab: remove SLAB_USER (diff)
downloadkernel-qcow2-linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.gz
kernel-qcow2-linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.xz
kernel-qcow2-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/net/net1080.c')
-rw-r--r--drivers/usb/net/net1080.c2
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)
int status;
/* Send a flush */
- urb = usb_alloc_urb(0, SLAB_ATOMIC);
+ urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb)
return;