aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945.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/3945.c
parentiwlegacy: remove temp_ops (diff)
downloadlinux-dev-a89268e8cdcd52680bda21ada05f2716c6466377.tar.xz
linux-dev-a89268e8cdcd52680bda21ada05f2716c6466377.zip
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/3945.c')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 4e63e7d48a7b..95d88b4f3106 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -2645,12 +2645,10 @@ static struct il_lib_ops il3945_lib = {
.init = il3945_apm_init,
.config = il3945_nic_config,
},
- .eeprom_ops = {
- .acquire_semaphore = il3945_eeprom_acquire_semaphore,
- .release_semaphore = il3945_eeprom_release_semaphore,
- },
.send_tx_power = il3945_send_tx_power,
.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,
+ .eeprom_acquire_semaphore = il3945_eeprom_acquire_semaphore,
+ .eeprom_release_semaphore = il3945_eeprom_release_semaphore,
};
static const struct il_legacy_ops il3945_legacy_ops = {