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/pegasus.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/pegasus.c')
| -rw-r--r-- | drivers/usb/net/pegasus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index b5690b3834e..d48c024cff5 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
| @@ -856,7 +856,7 @@ static void intr_callback(struct urb *urb) | |||
| 856 | pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4]; | 856 | pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4]; |
| 857 | } | 857 | } |
| 858 | 858 | ||
| 859 | status = usb_submit_urb(urb, SLAB_ATOMIC); | 859 | status = usb_submit_urb(urb, GFP_ATOMIC); |
| 860 | if (status == -ENODEV) | 860 | if (status == -ENODEV) |
| 861 | netif_device_detach(pegasus->net); | 861 | netif_device_detach(pegasus->net); |
| 862 | if (status && netif_msg_timer(pegasus)) | 862 | if (status && netif_msg_timer(pegasus)) |