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/input/powermate.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/input/powermate.c')
-rw-r--r-- | drivers/usb/input/powermate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c index 0bf91778c40d..fea97e5437f8 100644 --- a/drivers/usb/input/powermate.c +++ b/drivers/usb/input/powermate.c | |||
@@ -277,12 +277,12 @@ static int powermate_input_event(struct input_dev *dev, unsigned int type, unsig | |||
277 | static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm) | 277 | static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm) |
278 | { | 278 | { |
279 | pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX, | 279 | pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX, |
280 | SLAB_ATOMIC, &pm->data_dma); | 280 | GFP_ATOMIC, &pm->data_dma); |
281 | if (!pm->data) | 281 | if (!pm->data) |
282 | return -1; | 282 | return -1; |
283 | 283 | ||
284 | pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)), | 284 | pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)), |
285 | SLAB_ATOMIC, &pm->configcr_dma); | 285 | GFP_ATOMIC, &pm->configcr_dma); |
286 | if (!pm->configcr) | 286 | if (!pm->configcr) |
287 | return -1; | 287 | return -1; |
288 | 288 | ||