From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 17 Apr 2013 13:17:24 +0000 (+0200)
Subject: backports: mask hid_match_id() since it's present already
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e254269afb76c52356033f614c4e533cf3cc247;p=openwrt%2Fstaging%2Fblogic.git

backports: mask hid_match_id() since it's present already

On some kernels, hid_match_id() exists, so mask it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/backport/compat/compat-3.8.c b/backport/compat/compat-3.8.c
index a3d8f4b6daab..9f5df7d4a5fd 100644
--- a/backport/compat/compat-3.8.c
+++ b/backport/compat/compat-3.8.c
@@ -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)
 {