Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / dvm / dev.h

diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 29c571a56251d20dd6f5992d1b2d5805bb3725fc..2653a891cc7e713ebd7f5708b252f977de4e09ed 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -843,7 +843,7 @@ struct iwl_priv {
        void *wowlan_sram;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
-       struct iwl_eeprom_data *eeprom_data;
+       struct iwl_nvm_data *nvm_data;
        /* eeprom blob for debugfs/testmode */
        u8 *eeprom_blob;
        size_t eeprom_blob_size;