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/input | |
| 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/input')
| -rw-r--r-- | drivers/usb/input/acecad.c | 2 | ||||
| -rw-r--r-- | drivers/usb/input/usbtouchscreen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c index 0096373b5f98..909138e5aa04 100644 --- a/drivers/usb/input/acecad.c +++ b/drivers/usb/input/acecad.c | |||
| @@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
| 152 | if (!acecad || !input_dev) | 152 | if (!acecad || !input_dev) |
| 153 | goto fail1; | 153 | goto fail1; |
| 154 | 154 | ||
| 155 | acecad->data = usb_buffer_alloc(dev, 8, SLAB_KERNEL, &acecad->data_dma); | 155 | acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma); |
| 156 | if (!acecad->data) | 156 | if (!acecad->data) |
| 157 | goto fail1; | 157 | goto fail1; |
| 158 | 158 | ||
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c index 49704d4ed0e2..7f3c57da9bc0 100644 --- a/drivers/usb/input/usbtouchscreen.c +++ b/drivers/usb/input/usbtouchscreen.c | |||
| @@ -680,7 +680,7 @@ static int usbtouch_probe(struct usb_interface *intf, | |||
| 680 | type->process_pkt = usbtouch_process_pkt; | 680 | type->process_pkt = usbtouch_process_pkt; |
| 681 | 681 | ||
| 682 | usbtouch->data = usb_buffer_alloc(udev, type->rept_size, | 682 | usbtouch->data = usb_buffer_alloc(udev, type->rept_size, |
| 683 | SLAB_KERNEL, &usbtouch->data_dma); | 683 | GFP_KERNEL, &usbtouch->data_dma); |
| 684 | if (!usbtouch->data) | 684 | if (!usbtouch->data) |
| 685 | goto out_free; | 685 | goto out_free; |
| 686 | 686 | ||
