patch-2.4.2 linux/drivers/usb/wacom.c

• Lines: 18
• Date: Fri Feb 9 11:30:23 2001
• Orig file: v2.4.1/linux/drivers/usb/wacom.c
• Orig date: Thu Jan 4 13:15:32 2001

diff -u --recursive --new-file v2.4.1/linux/drivers/usb/wacom.c linux/drivers/usb/wacom.c
@@ -51,7 +51,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -285,7 +285,7 @@
 
 struct wacom_features wacom_features[] = {
 	{ "Wacom Graphire",      8, 10206,  7422,  511, 32, wacom_graphire_irq,
-		BIT(EV_REL), 0, REL_WHEEL, 0 },
+		BIT(EV_REL), 0, BIT(REL_WHEEL), 0 },
 	{ "Wacom Intuos 4x5",   10, 12700, 10360, 1023, 15, wacom_intuos_irq,
 		0, WACOM_INTUOS_ABS, 0, WACOM_INTUOS_BUTTONS, WACOM_INTUOS_TOOLS },
 	{ "Wacom Intuos 6x8",   10, 20320, 15040, 1023, 15, wacom_intuos_irq,