diff --git a/[refs] b/[refs] index 9fdc8f3e4e41..898739c366bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 854019a3c6a0435b468e4a3f5e545a770d5cdf6f +refs/heads/master: 06265442028254cce5a6f19dfa0bab11c88f06fe diff --git a/trunk/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/trunk/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h index 5a6c27e9aa5a..66817c2c5022 100644 --- a/trunk/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h +++ b/trunk/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h @@ -625,7 +625,7 @@ typedef enum { * arguments: * UINT32 cmd (AR6000_XIOCTL_USER_SETKEYS) * UINT32 keyOpCtrl - * uses AR6000_USER_SETKEYS_INFO + * uses struct ar6000_user_setkeys_info */ #define AR6000_XIOCTL_USER_SETKEYS 58 #endif /* USER_KEYS */ @@ -1098,10 +1098,9 @@ typedef struct targetStats_cmd_t { #define AR6000_XIOCTL_USER_SETKEYS_RSC_CTRL 1 #define AR6000_USER_SETKEYS_RSC_UNCHANGED 0x00000002 -typedef struct { +struct ar6000_user_setkeys_info { u32 keyOpCtrl; /* Bit Map of Key Mgmt Ctrl Flags */ -} AR6000_USER_SETKEYS_INFO; - +}; /* XXX: unused !? */ /* used by AR6000_XIOCTL_GPIO_OUTPUT_SET */ struct ar6000_gpio_output_set_cmd_s {