X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.c;h=b1ead399deebcd25dc8746c53062e358c387875d;hb=05448cc510e12a9aeb974701924d1ee9507779e7;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..b1ead39 100755
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -33,23 +33,22 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_ah.h"
 #include "ah.h"
 #include "ah_internal.h"
 #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 +66,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;
 	}