backports: mask hid_match_id() since it's present already
authorJohannes Berg <johannes.berg@intel.com>
Wed, 17 Apr 2013 13:17:24 +0000 (15:17 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 17 Apr 2013 13:17:24 +0000 (15:17 +0200)
On some kernels, hid_match_id() exists, so mask it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
backport/compat/compat-3.8.c

index a3d8f4b6daab42d4672b075061b96854e4824fcd..9f5df7d4a5fde3c5951e594efea0e0883cd14944 100644 (file)
@@ -277,6 +277,7 @@ static bool hid_match_one_id(struct hid_device *hdev,
                (id->product == HID_ANY_ID || id->product == hdev->product);
 }
 
+#define hid_match_id LINUX_BACKPORT(hid_match_id)
 static const struct hid_device_id *
 hid_match_id(struct hid_device *hdev, const struct hid_device_id *id)
 {