From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 17 Jun 2013 11:10:59 +0000 (+0200)
Subject: backports: remove useless include in USB_VENDOR_AND_INTERFACE_INFO
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=528d67eb0f0fd7bf707cd296585a1f1d4bf4ce50;p=openwrt%2Fstaging%2Fblogic.git

backports: remove useless include in USB_VENDOR_AND_INTERFACE_INFO

This also changes the #if <kernel version> to a ifndef, now it is also
compatible with kernel already containing this backport.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/backport/backport-include/linux/usb.h b/backport/backport-include/linux/usb.h
index 8ea9d75021a4..6d27479b1d15 100644
--- a/backport/backport-include/linux/usb.h
+++ b/backport/backport-include/linux/usb.h
@@ -18,7 +18,7 @@
 		       usb_deregister)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+#ifndef USB_VENDOR_AND_INTERFACE_INFO
 /**
  * Backports
  *
@@ -28,7 +28,6 @@
  *
  * 	USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
  */
-#include <linux/usb.h>
 #define USB_VENDOR_AND_INTERFACE_INFO(vend, cl, sc, pr) \
        .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
                | USB_DEVICE_ID_MATCH_VENDOR, \
@@ -36,7 +35,7 @@
        .bInterfaceClass = (cl), \
        .bInterfaceSubClass = (sc), \
        .bInterfaceProtocol = (pr)
-#endif
+#endif /* USB_VENDOR_AND_INTERFACE_INFO */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 #ifdef CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX