Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac394917 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Let rt2800lib check CONFIG_RT2X00_LIB_USB instead of CONFIG_RT2800USB 



rt2800lib currently checks whether RT2800USB is enabled in the configuration.
Strictly speaking this is not necessary, it only needs to know whether the
generic rt2x00usb library functions are available. Therefore check for
RT2X00_LIB_USB instead.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00e23ce2

drivers/net/wireless/rt2x00/rt2800lib.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/module.h>



#include "rt2x00.h"

#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)

#if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE)

#include "rt2x00usb.h"

#endif

#include "rt2800lib.h"
@@ -1121,7 +1121,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) 


	if (rt2x00_intf_is_usb(rt2x00dev)) {

		rt2800_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);

#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)

#if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE)

		rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,

					    USB_MODE_RESET, REGISTER_TIMEOUT);

#endif