summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/4965.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-13 11:23:16 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-22 14:51:13 -0500
commita89268e8cdcd52680bda21ada05f2716c6466377 (patch)
treebd8ead31aa28ccb0e193c03535915185bdbf27ea /drivers/net/wireless/iwlegacy/4965.c
parent527901d0aeb233a479123b7e5f542fbc911ccf6d (diff)
downloadop-kernel-dev-a89268e8cdcd52680bda21ada05f2716c6466377.zip
op-kernel-dev-a89268e8cdcd52680bda21ada05f2716c6466377.tar.gz
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 3a30aac..3ddc31f 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 = {
.init = il_apm_init,
.config = il4965_nic_config,
},
- .eeprom_ops = {
- .acquire_semaphore = il4965_eeprom_acquire_semaphore,
- .release_semaphore = il4965_eeprom_release_semaphore,
- },
.send_tx_power = il4965_send_tx_power,
.update_chain_flags = il4965_update_chain_flags,
+ .eeprom_acquire_semaphore = il4965_eeprom_acquire_semaphore,
+ .eeprom_release_semaphore = il4965_eeprom_release_semaphore,
};
static const struct il_legacy_ops il4965_legacy_ops = {
OpenPOWER on IntegriCloud