Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-ids.h between commits adc232592337 ("[media] si4713: HID
blacklist Si4713 USB development board") and 3db187e7bf76 ("HID:
multitouch: add FocalTech FTxxxx support") from Linus' tree and commit
e932d8178667 ("HID: add hid-cp2112 driver") from the hid tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc drivers/hid/hid-ids.h index 22f28d6b33a8,00be0d0f0dde..000000000000 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@ -241,9 -240,7 +241,10 @@@ #define USB_VENDOR_ID_CYGNAL 0x10c4 #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X 0x818a +#define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH 0x81b9 + +#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713 0x8244 + #define USB_DEVICE_ID_CYGNAL_CP2112 0xea90 #define USB_VENDOR_ID_CYPRESS 0x04b4 #define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001
pgp6fcRDEz_x5.pgp
Description: PGP signature
