iwlagn: merge eeprom access into single file
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 15 Sep 2011 18:46:41 +0000 (11:46 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 19:58:30 +0000 (15:58 -0400)
After driver split and no need to support legacy devices, there is no reason
we need to separate the NVM access into different files, merge those.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/Makefile
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c [deleted file]
drivers/net/wireless/iwlwifi/iwl-eeprom.c

Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
Simple merge