Skip to contentSkip to conversation

rt2x00: Fix building of rt2800lib when rt2x00 driver is built-in.

PATCH In review Gertjan van Wingerde 2 participants 2 messages Nov 9, 2009 – Nov 10, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 10/10 rt2x00: Fix building of rt2800lib when rt2x00 driver is built-in.

When enabling rt2800usb as a built-in driver (as opposed to a as a module) the build fails. See
http://marc.info/?l=linux-wireless&m=125768687711034&w=2 for details.

Fix it by properly including <linux/usb.h> from rt2x00usb.h

---

John, this is one to merge upstream quickly --> we currently have build failures in next.

---

---
 drivers/net/wireless/rt2x00/rt2x00usb.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2x00usb.h +2 -0
index d63e1df..3da6841 100644
@@ -26,6 +26,8 @@
 #ifndef RT2X00USB_H
 #define RT2X00USB_H
 
+#include <linux/usb.h>
+
 #define to_usb_device_intf(d) \
 ({ \
 	struct usb_interface *intf = to_usb_interface(d); \
Signature · 1 line
1.6.5.2
Acked-by on v1 10/10
#1 lore raw
Quoted 6 lines · Gertjan van Wingerde

When enabling rt2800usb as a built-in driver (as opposed to a as a module) the build fails. See
http://marc.info/?l=linux-wireless&m=125768687711034&w=2 for details.

Fix it by properly including <linux/usb.h> from rt2x00usb.h

Quoted 22 lines

---

John, this is one to merge upstream quickly --> we currently have build failures in next.

---

---
 drivers/net/wireless/rt2x00/rt2x00usb.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2x00usb.h +2 -0
index d63e1df..3da6841 100644
@@ -26,6 +26,8 @@
 #ifndef RT2X00USB_H
 #define RT2X00USB_H
 
+#include <linux/usb.h>
+
 #define to_usb_device_intf(d) \
 ({ \
 	struct usb_interface *intf = to_usb_interface(d); \