projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ucc_geth: migrate ucc_geth to phylib
[powerpc.git]
/
drivers
/
usb
/
input
/
aiptek.c
diff --git
a/drivers/usb/input/aiptek.c
b/drivers/usb/input/aiptek.c
index
bf42818
..
f857935
100644
(file)
--- a/
drivers/usb/input/aiptek.c
+++ b/
drivers/usb/input/aiptek.c
@@
-76,7
+76,6
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>
-#include <linux/sched.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
@@
-1988,7
+1987,7
@@
aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
goto fail1;
aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,
goto fail1;
aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,
-
SLAB
_ATOMIC, &aiptek->data_dma);
+
GFP
_ATOMIC, &aiptek->data_dma);
if (!aiptek->data)
goto fail1;
if (!aiptek->data)
goto fail1;