From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 20 Jan 2010 19:33:16 +0000 (+0100)
Subject: compat: fix build with CONFIG_USB=m
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=09bb5f3ad3868a66eb2fed3d3b279071b0550a1b;p=openwrt%2Fstaging%2Fblogic.git

compat: fix build with CONFIG_USB=m

The usb compat code was not build if usb was build as module in kernel.

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

diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
index a141859f70b3..115bd23a719d 100644
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -17,7 +17,7 @@
 /* 2.6.28 compat code goes here */
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 /*
  * Compat-wireless notes for USB backport stuff:
  *
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(pcmcia_loop_config);
 
 #endif /* CONFIG_PCMCIA */
 
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 
 void usb_unpoison_urb(struct urb *urb)
 {
diff --git a/compat/compat-2.6.29.c b/compat/compat-2.6.29.c
index 48e72a352c45..c8e0183fa08b 100644
--- a/compat/compat-2.6.29.c
+++ b/compat/compat-2.6.29.c
@@ -16,7 +16,7 @@
 #include <linux/etherdevice.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 /**
  * usb_unpoison_anchored_urbs - let an anchor be used successfully again
  * @anchor: anchor the requests are bound to
diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h
index 13a036749129..2cab3201dba0 100644
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -52,7 +52,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
 /* USB anchors were added as of 2.6.23 */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
 
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 #if 0
 extern void usb_poison_urb(struct urb *urb);
 #endif
diff --git a/include/linux/compat-2.6.29.h b/include/linux/compat-2.6.29.h
index 27f1325253e4..c3572a2026a3 100644
--- a/include/linux/compat-2.6.29.h
+++ b/include/linux/compat-2.6.29.h
@@ -47,7 +47,7 @@ static inline struct net_device_stats *dev_get_stats(struct net_device *dev)
 }
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 extern void usb_unpoison_anchored_urbs(struct usb_anchor *anchor);
 #endif /* CONFIG_USB */
 #endif