Commit b8036d5a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: fixups due to the aiptek patch to get everything to build properly.

parent bec927e7
...@@ -24,6 +24,7 @@ obj-$(CONFIG_USB_PRINTER) += class/ ...@@ -24,6 +24,7 @@ obj-$(CONFIG_USB_PRINTER) += class/
obj-$(CONFIG_USB_STORAGE) += storage/ obj-$(CONFIG_USB_STORAGE) += storage/
obj-$(CONFIG_USB_AIPTEK) += input/
obj-$(CONFIG_USB_HID) += input/ obj-$(CONFIG_USB_HID) += input/
obj-$(CONFIG_USB_KBD) += input/ obj-$(CONFIG_USB_KBD) += input/
obj-$(CONFIG_USB_MOUSE) += input/ obj-$(CONFIG_USB_MOUSE) += input/
......
...@@ -13,10 +13,10 @@ ifeq ($(CONFIG_USB_HIDINPUT),y) ...@@ -13,10 +13,10 @@ ifeq ($(CONFIG_USB_HIDINPUT),y)
hid-objs += hid-input.o hid-objs += hid-input.o
endif endif
obj-$(CONFIG_USB_AIPTEK) += aiptek.o
obj-$(CONFIG_USB_HID) += hid.o obj-$(CONFIG_USB_HID) += hid.o
obj-$(CONFIG_USB_KBD) += usbkbd.o obj-$(CONFIG_USB_KBD) += usbkbd.o
obj-$(CONFIG_USB_MOUSE) += usbmouse.o obj-$(CONFIG_USB_MOUSE) += usbmouse.o
obj-$(CONFIG_USB_AIPTEK) += aiptek.o
obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_WACOM) += wacom.o
......
...@@ -210,9 +210,15 @@ aiptek_command(struct usb_device *dev, unsigned int ifnum, ...@@ -210,9 +210,15 @@ aiptek_command(struct usb_device *dev, unsigned int ifnum,
buf[1] = command; buf[1] = command;
buf[2] = data; buf[2] = data;
/*
* FIXME, either remove this call, or talk the maintainer into
* adding it back into the core.
*/
#if 0
if (usb_set_report(dev, ifnum, 3, 2, buf, 3) != 3) { if (usb_set_report(dev, ifnum, 3, 2, buf, 3) != 3) {
dbg("aiptek_command: 0x%x 0x%x\n", command, data); dbg("aiptek_command: 0x%x 0x%x\n", command, data);
} }
#endif
} }
static void* static void*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment