From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 28 Jun 2007 00:01:11 +0000 (+0000)
Subject: clean up the madwifi SoC support patch - remove some breakage that went unnoticed... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d437ce276ad0282696268f1013d33966a1fa6698;p=openwrt%2Fstaging%2Fblocktrron.git

clean up the madwifi SoC support patch - remove some breakage that went unnoticed because it only applies to kernelversions before 2.6.19

SVN-Revision: 7746
---

diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch
index 067dbfbb1c..fd3a200799 100644
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@@ -43,26 +43,4 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath_ahb.c
  
  	return 0;
  }
-@@ -439,7 +441,7 @@
- 			(AR5315_REV_MAJ_M | AR5315_REV_MIN_M));
- 		if (((devid & AR5315_REV_MAJ_M) == AR5315_REV_MAJ) ||
- 			((devid & AR5315_REV_MAJ_M) == AR5317_REV_MAJ))
--			return init_ath_wmac(devid, 0, &config);
-+			return init_ath_wmac(devid, 0);
- 	}
- 
- 	devid = (u_int16_t) ((sysRegRead(AR531X_REV) >>8) &
-@@ -452,11 +454,11 @@
- 		ar5312BspEepromRead(2 * AR531X_RADIO_MASK_OFF, 2,
- 			(char *) &radioMask);
- 		if ((radioMask & AR531X_RADIO0_MASK) != 0)
--			if ((ret = init_ath_wmac(devid, 0, &config)) !=0 )
-+			if ((ret = init_ath_wmac(devid, 0)) !=0 )
- 				return ret;
- 		/* XXX: Fall through?! */
- 	case AR5212_AR2313_REV8:
--		if ((ret = init_ath_wmac(devid, 1, &config)) != 0)
-+		if ((ret = init_ath_wmac(devid, 1)) != 0)
- 			return ret;
- 		break;
- 	default:
+