diff --git a/[refs] b/[refs] index 00f209d17415..cea691625106 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f6e0e449c00bafe1c46471409fa1b8e4222dcf2 +refs/heads/master: 2d200d9f63786f7dd18d47e28c7b3eb8d261aae4 diff --git a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c index cea033411e47..57180ee2067a 100644 --- a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c @@ -162,6 +162,8 @@ enum cmd_mode typedef enum cmd_mode CMD_MODE; #define THROTTLE_JIFFIES (HZ/8) +#define URB_ASYNC_UNLINK 0 +#define USB_QUEUE_BULK 0 /*================================================================*/ /* Local Macros */ diff --git a/trunk/drivers/staging/wlan-ng/wlan_compat.h b/trunk/drivers/staging/wlan-ng/wlan_compat.h index d33548a0cb49..0b094e5eb64a 100644 --- a/trunk/drivers/staging/wlan-ng/wlan_compat.h +++ b/trunk/drivers/staging/wlan-ng/wlan_compat.h @@ -84,9 +84,6 @@ #undef netdevice_t typedef struct net_device netdevice_t; -#define URB_ASYNC_UNLINK 0 -#define USB_QUEUE_BULK 0 - /*=============================================================*/ /*--- General Macros ------------------------------------------*/ /*=============================================================*/