Merge branch 'tc1100-wmi' into release

[deliverable/linux.git] / drivers / staging / rt2860 / common / eeprom.c

diff --git a/drivers/staging/rt2860/common/eeprom.c b/drivers/staging/rt2860/common/eeprom.c
index 764de3a7807f7fa74d3631f6c31a6011c33e8043..94670076d32ba0ec2cf13cc4a798cde3362962db 100644 (file)
--- a/drivers/staging/rt2860/common/eeprom.c
+++ b/drivers/staging/rt2860/common/eeprom.c
@@ -36,9 +36,9 @@
 */
 #include "../rt_config.h"
 
-int RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, int infType)
+int RtmpChipOpsEepromHook(struct rt_rtmp_adapter *pAd, int infType)
 {
-       RTMP_CHIP_OP *pChipOps = &pAd->chipOps;
+       struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
 #ifdef RT30xx
 #ifdef RTMP_EFUSE_SUPPORT
        u32 eFuseCtrl, MacCsr0;