diff -Naurp madwifi-openhal/ath/if_ath.c madwifi-openhal-fixed/ath/if_ath.c
--- madwifi-openhal/ath/if_ath.c	2005-06-24 06:41:22.000000000 -0400
+++ madwifi-openhal-fixed/ath/if_ath.c	2006-08-04 14:49:38.000000000 -0400
@@ -245,13 +245,20 @@ enum {
 #endif
 
 static	int countrycode = -1;
-MODULE_PARM(countrycode, "i");
-MODULE_PARM_DESC(countrycode, "Override default country code");
 static	int outdoor = -1;
-MODULE_PARM(outdoor, "i");
-MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use");
 static	int xchanmode = -1;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
+MODULE_PARM(countrycode, "i");
+MODULE_PARM(outdoor, "i");
 MODULE_PARM(xchanmode, "i");
+#else
+#include <linux/moduleparam.h>
+module_param(countrycode, int, 0);
+module_param(outdoor, int, 0);
+module_param(xchanmode, int, 0);
+#endif
+MODULE_PARM_DESC(countrycode, "Override default country code");
+MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use");
 MODULE_PARM_DESC(xchanmode, "Enable/disable extended channel mode");
 
 int
diff -Naurp madwifi-openhal/openhal/ar5xxx.h madwifi-openhal-fixed/openhal/ar5xxx.h
--- madwifi-openhal/openhal/ar5xxx.h	2006-08-03 15:24:30.000000000 -0400
+++ madwifi-openhal-fixed/openhal/ar5xxx.h	2006-08-04 14:42:37.000000000 -0400
@@ -1425,7 +1425,7 @@ struct ar5k_srev_name {
 	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },	\
 	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },	\
 	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },	\
-	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\ 
+	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\
 	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },	\
 	{ "2112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },	\
 	{ "xxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN }	\