X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.c;h=30c959426b33d43cc8d01864b6957df164179e9c;hb=78f74c09684b8311c9daafbd0216e27eb9f905d8;hp=53993f535dafac3cad69d80d818a134fceca34c5;hpb=eaacae6cedaf752150758b9baa0917e1deb1a99f;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index 53993f5..30c9594 100755
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -39,17 +39,17 @@
 #include <asf_bitmap.h>
 
 extern struct ath_hal *ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
-				    HAL_BUS_HANDLE sh, a_uint32_t flags, HAL_STATUS *status);
+				    a_uint32_t flags, HAL_STATUS *status);
 
 struct ath_hal*
 ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc,
-		   adf_os_device_t dev, HAL_BUS_HANDLE sh,
+		   adf_os_device_t dev,
 		   a_uint32_t flags, HAL_STATUS *error)
 {
 	struct ath_hal *ah = AH_NULL;
 
 	devid = AR5416_DEVID_PCIE;
-	ah = ar5416Attach(devid, sc, dev, sh, flags, error);
+	ah = ar5416Attach(devid, sc, dev, flags, error);
 
 	return ah;
 }
@@ -67,12 +67,6 @@ ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
 		return pCap->halBssIdMaskSupport ? HAL_OK : HAL_ENOTSUPP;
 	case HAL_CAP_VEOL:
 		return pCap->halVEOLSupport ? HAL_OK : HAL_ENOTSUPP;
-#ifdef MAGPIE_MERLIN
-	case HAL_CAP_RX_STBC:
-		return HAL_ENOTSUPP;
-	case HAL_CAP_TX_STBC:
-		return HAL_ENOTSUPP;
-#endif
 	default:
 		return HAL_EINVAL;
 	}