iwlegacy: merge eeprom_ops into lib_ops

[mv-sheeva.git] / drivers / net / wireless / iwlegacy / 4965.c

diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 3a30aacf5d0c0e37626e9518c859e8d8eec89b95..3ddc31f0f9e763239779522375d3f9e6957d5fdc 100644 (file)
--- 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 = {