On Tue, Nov 15, 2011 at 3:28 PM, Marek Vasut <marek.vasut@xxxxxxxxx> wrote:
>> On Mon, Nov 14, 2011 at 10:41 AM, Marek Vasut <marek.vasut@xxxxxxxxx> wrote:
>> > @@ -1377,6 +1377,7 @@ static const struct hid_device_id
>> > hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, + {
>> > HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
>> > USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
>>
>> We have a merge issue here since the 0xa001 got committed as #5.
>
> Was it applied already?
>
Yes, its in Jiri's upstream-fixes branch.
Chris
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
