Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
From: Hans de Goede
Date: Tue Jun 19 2012 - 07:51:04 EST
Hi,
On 06/19/2012 12:06 PM, Jiri Kosina wrote:
On Tue, 19 Jun 2012, Stephen Rothwell wrote:
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
("[media] radio/si470x: Add support for the Axentia ALERT FM USB
Receiver") from the v4l-dvb tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/hid/hid-ids.h
index 6d3037e,70298d1..0000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -160,9 -157,9 +160,12 @@@
#define USB_VENDOR_ID_AVERMEDIA 0x07ca
#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
+ #define USB_VENDOR_ID_AXENTIA 0x12cf
+ #define USB_DEVICE_ID_AXENTIA_FM_RADIO 0x7111
+
+#define USB_VENDOR_ID_BAANTO 0x2453
+#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
+
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201
Thanks for reporting this, Stephen.
Hmmm ... Mauro, Hans, do you feel it's actually proper to add the device
ids to hid-ids.h? I am using this file usually solely for the drivers on
the HID bus, which radio-si470x is not, I believe.
Not sure what you mean with "drivers on the HID bus", radio-si470x drivers
do use a USB-HID class interface, but the driver itself does not use
the kernel hid framework. The ids in hid-ids are used for adding this device
to the hid-core "blacklist" to avoid usb-hid from binding to it, so that
radio-si470x-usn can bind to it.
Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/