diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-13 05:23:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:51:13 -0500 |
commit | a89268e8cdcd52680bda21ada05f2716c6466377 (patch) | |
tree | bd8ead31aa28ccb0e193c03535915185bdbf27ea /drivers/net/wireless/iwlegacy/4965.c | |
parent | 527901d0aeb233a479123b7e5f542fbc911ccf6d (diff) |
iwlegacy: merge eeprom_ops into lib_ops
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c index 3a30aacf5d0c..3ddc31f0f9e7 100644 --- a/drivers/net/wireless/iwlegacy/4965.c +++ b/drivers/net/wireless/iwlegacy/4965.c | |||
@@ -1904,12 +1904,10 @@ static struct il_lib_ops il4965_lib = { | |||
1904 | .init = il_apm_init, | 1904 | .init = il_apm_init, |
1905 | .config = il4965_nic_config, | 1905 | .config = il4965_nic_config, |
1906 | }, | 1906 | }, |
1907 | .eeprom_ops = { | ||
1908 | .acquire_semaphore = il4965_eeprom_acquire_semaphore, | ||
1909 | .release_semaphore = il4965_eeprom_release_semaphore, | ||
1910 | }, | ||
1911 | .send_tx_power = il4965_send_tx_power, | 1907 | .send_tx_power = il4965_send_tx_power, |
1912 | .update_chain_flags = il4965_update_chain_flags, | 1908 | .update_chain_flags = il4965_update_chain_flags, |
1909 | .eeprom_acquire_semaphore = il4965_eeprom_acquire_semaphore, | ||
1910 | .eeprom_release_semaphore = il4965_eeprom_release_semaphore, | ||
1913 | }; | 1911 | }; |
1914 | 1912 | ||
1915 | static const struct il_legacy_ops il4965_legacy_ops = { | 1913 | static const struct il_legacy_ops il4965_legacy_ops = { |