diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/usb/net/usbnet.c | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
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/usbnet.c')
-rw-r--r-- | drivers/usb/net/usbnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 327f97555679..6e39e9988259 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
@@ -179,9 +179,9 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf) | |||
179 | period = max ((int) dev->status->desc.bInterval, | 179 | period = max ((int) dev->status->desc.bInterval, |
180 | (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3); | 180 | (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3); |
181 | 181 | ||
182 | buf = kmalloc (maxp, SLAB_KERNEL); | 182 | buf = kmalloc (maxp, GFP_KERNEL); |
183 | if (buf) { | 183 | if (buf) { |
184 | dev->interrupt = usb_alloc_urb (0, SLAB_KERNEL); | 184 | dev->interrupt = usb_alloc_urb (0, GFP_KERNEL); |
185 | if (!dev->interrupt) { | 185 | if (!dev->interrupt) { |
186 | kfree (buf); | 186 | kfree (buf); |
187 | return -ENOMEM; | 187 | return -ENOMEM; |