diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
| commit | 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch) | |
| tree | e07fa00abdd55b31e22567786c78635f32c6a66c /include/linux/ath9k_platform.h | |
| parent | 6ba1037c3d871ab70e342631516dbf841c35b086 (diff) | |
| parent | b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
Diffstat (limited to 'include/linux/ath9k_platform.h')
| -rw-r--r-- | include/linux/ath9k_platform.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h index b847fc7b93f..020387a114e 100644 --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h | |||
| @@ -23,6 +23,11 @@ | |||
| 23 | 23 | ||
| 24 | struct ath9k_platform_data { | 24 | struct ath9k_platform_data { |
| 25 | u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS]; | 25 | u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS]; |
| 26 | u8 *macaddr; | ||
| 27 | |||
| 28 | int led_pin; | ||
| 29 | u32 gpio_mask; | ||
| 30 | u32 gpio_val; | ||
| 26 | }; | 31 | }; |
| 27 | 32 | ||
| 28 | #endif /* _LINUX_ATH9K_PLATFORM_H */ | 33 | #endif /* _LINUX_ATH9K_PLATFORM_H */ |