diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
| commit | 38a00840638b4932152bca48098dbfa069d942a2 (patch) | |
| tree | dd12897854f6df8aac237d5fd46551c74be8153a /drivers/net/wireless/libertas | |
| parent | 391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f (diff) | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h index 2e2dbfa2ee50..96726f79a1dd 100644 --- a/drivers/net/wireless/libertas/host.h +++ b/drivers/net/wireless/libertas/host.h | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | #define CMD_802_11_BEACON_STOP 0x0049 | 68 | #define CMD_802_11_BEACON_STOP 0x0049 |
| 69 | #define CMD_802_11_MAC_ADDRESS 0x004d | 69 | #define CMD_802_11_MAC_ADDRESS 0x004d |
| 70 | #define CMD_802_11_LED_GPIO_CTRL 0x004e | 70 | #define CMD_802_11_LED_GPIO_CTRL 0x004e |
| 71 | #define CMD_802_11_EEPROM_ACCESS 0x0059 | ||
| 72 | #define CMD_802_11_BAND_CONFIG 0x0058 | 71 | #define CMD_802_11_BAND_CONFIG 0x0058 |
| 73 | #define CMD_GSPI_BUS_CONFIG 0x005a | 72 | #define CMD_GSPI_BUS_CONFIG 0x005a |
| 74 | #define CMD_802_11D_DOMAIN_INFO 0x005b | 73 | #define CMD_802_11D_DOMAIN_INFO 0x005b |