diff -ru madwifi-ng-r1605-20060527/ath/if_ath.c madwifi-ng-r1605-20060527-mario/ath/if_ath.c
--- madwifi-ng-r1605-20060527/ath/if_ath.c	2006-05-05 08:09:46.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/ath/if_ath.c	2006-10-29 21:31:58.000000000 +0100
@@ -44,7 +44,7 @@
  */
 #include "opt_ah.h"
 
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -ru madwifi-ng-r1605-20060527/ath/if_ath_pci.c madwifi-ng-r1605-20060527-mario/ath/if_ath_pci.c
--- madwifi-ng-r1605-20060527/ath/if_ath_pci.c	2006-05-22 06:39:55.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/ath/if_ath_pci.c	2006-10-29 21:32:41.000000000 +0100
@@ -42,7 +42,7 @@
 #define	EXPORT_SYMTAB
 #endif
 
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -ru madwifi-ng-r1605-20060527/ath_rate/sample/sample.c madwifi-ng-r1605-20060527-mario/ath_rate/sample/sample.c
--- madwifi-ng-r1605-20060527/ath_rate/sample/sample.c	2006-05-22 06:39:55.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/ath_rate/sample/sample.c	2006-10-29 21:35:27.000000000 +0100
@@ -41,7 +41,7 @@
  * John Bicket's SampleRate control algorithm.
  */
 
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -ru madwifi-ng-r1605-20060527/hal/linux/ah_osdep.c madwifi-ng-r1605-20060527-mario/hal/linux/ah_osdep.c
--- madwifi-ng-r1605-20060527/hal/linux/ah_osdep.c	2006-05-19 12:25:45.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/hal/linux/ah_osdep.c	2006-10-29 21:27:57.000000000 +0100
@@ -41,7 +41,7 @@
 #define	EXPORT_SYMTAB
 #endif
 
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -ru madwifi-ng-r1605-20060527/include/compat.h madwifi-ng-r1605-20060527-mario/include/compat.h
--- madwifi-ng-r1605-20060527/include/compat.h	2006-04-25 23:25:41.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/include/compat.h	2006-10-29 21:31:02.000000000 +0100
@@ -43,7 +43,7 @@
  */
 #define	NBBY	8			/* number of bits/byte */
 
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
+//#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
 #define	howmany(x, y)	(((x)+((y)-1))/(y))
 
 /* Bit map related macros. */
diff -ru madwifi-ng-r1605-20060527/kernelversion.c madwifi-ng-r1605-20060527-mario/kernelversion.c
--- madwifi-ng-r1605-20060527/kernelversion.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/kernelversion.c	2006-10-29 21:18:36.000000000 +0100
@@ -4,7 +4,13 @@
  * file.
  * Taken from the lm_sensors project.
  *
- * $Id: kernelversion.c 1426 2006-02-01 20:07:11Z mrenzmann $
+ * $Id: kernelversion.c 1669 2006-07-05 02:21:30Z proski $
  */
 #include <linux/version.h>
+
+/* Linux 2.6.18+ uses <linux/utsrelease.h> */
+#ifndef UTS_RELEASE
+#include <linux/utsrelease.h>
+#endif
+
 char *uts_release = UTS_RELEASE;
Only in madwifi-ng-r1605-20060527-mario: Module.symvers
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_acl.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_acl.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_acl.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_acl.c	2006-10-29 21:42:15.000000000 +0100
@@ -45,7 +45,7 @@
  * and if found the frame is either accepted (ACL_POLICY_ALLOW)
  * or rejected (ACL_POLICY_DENT).
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_beacon.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_beacon.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_beacon.c	2006-05-19 22:42:19.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_beacon.c	2006-10-29 21:40:55.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 beacon handling routines
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211.c	2006-10-29 21:37:02.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 generic handler
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_crypto.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_crypto.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto.c	2006-10-29 21:41:25.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 generic crypto support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_ccmp.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_ccmp.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_ccmp.c	2006-02-06 21:20:57.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_ccmp.c	2006-10-29 21:43:35.000000000 +0100
@@ -38,7 +38,7 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_none.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_none.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_none.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_none.c	2006-10-29 21:44:34.000000000 +0100
@@ -34,7 +34,7 @@
 /*
  * IEEE 802.11 NULL crypto support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_tkip.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_tkip.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_tkip.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_tkip.c	2006-10-29 21:44:54.000000000 +0100
@@ -38,7 +38,7 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_wep.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_wep.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_crypto_wep.c	2006-02-06 21:20:57.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_crypto_wep.c	2006-10-29 21:45:09.000000000 +0100
@@ -34,7 +34,7 @@
 /*
  * IEEE 802.11 WEP crypto support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_input.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_input.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_input.c	2006-04-24 01:54:40.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_input.c	2006-10-29 21:45:36.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 input handling.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_linux.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_linux.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_linux.c	2006-05-22 06:39:55.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_linux.c	2006-10-29 21:56:29.000000000 +0100
@@ -33,7 +33,7 @@
 /*
  * IEEE 802.11 support (Linux-specific code)
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
@@ -44,6 +44,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
 
 #include <net/iw_handler.h>
 #include <linux/wireless.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_monitor.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_monitor.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_monitor.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_monitor.c	2006-10-29 21:46:07.000000000 +0100
@@ -34,7 +34,7 @@
 /*
  * IEEE 802.11 monitor mode 
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_node.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_node.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_node.c	2006-05-12 05:44:02.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_node.c	2006-10-29 21:46:26.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 node handling support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_output.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_output.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_output.c	2006-05-19 22:42:19.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_output.c	2006-10-29 21:46:46.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 output handling.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_power.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_power.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_power.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_power.c	2006-10-29 21:47:02.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 power save support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_proto.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_proto.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_proto.c	2006-05-01 00:04:46.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_proto.c	2006-10-29 21:47:17.000000000 +0100
@@ -38,7 +38,7 @@
 /*
  * IEEE 802.11 protocol support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/kmod.h>
 #include <linux/module.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_scan_ap.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan_ap.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_scan_ap.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan_ap.c	2006-10-29 21:47:39.000000000 +0100
@@ -37,7 +37,7 @@
 /*
  * IEEE 802.11 ap scanning support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_scan.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_scan.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan.c	2006-10-29 21:48:27.000000000 +0100
@@ -37,7 +37,7 @@
 /*
  * IEEE 802.11 scanning support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_scan_sta.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan_sta.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_scan_sta.c	2006-04-21 18:57:59.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_scan_sta.c	2006-10-29 21:48:46.000000000 +0100
@@ -37,7 +37,7 @@
 /*
  * IEEE 802.11 station scanning support.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_wireless.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_wireless.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_wireless.c	2006-05-26 00:23:38.000000000 +0200
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_wireless.c	2006-10-29 21:49:28.000000000 +0100
@@ -39,7 +39,7 @@
 /*
  * Wireless extensions support for 802.11 common code.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 
 #ifdef CONFIG_NET_WIRELESS
 #include <linux/version.h>
diff -ru madwifi-ng-r1605-20060527/net80211/ieee80211_xauth.c madwifi-ng-r1605-20060527-mario/net80211/ieee80211_xauth.c
--- madwifi-ng-r1605-20060527/net80211/ieee80211_xauth.c	2006-02-01 21:07:11.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/ieee80211_xauth.c	2006-10-29 21:49:46.000000000 +0100
@@ -46,7 +46,7 @@
  * of the available callbacks--the user mode authenticator process works
  * entirely from messages about stations joining and leaving.
  */
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -ru madwifi-ng-r1605-20060527/net80211/if_media.c madwifi-ng-r1605-20060527-mario/net80211/if_media.c
--- madwifi-ng-r1605-20060527/net80211/if_media.c	2006-02-06 21:20:57.000000000 +0100
+++ madwifi-ng-r1605-20060527-mario/net80211/if_media.c	2006-10-29 21:36:20.000000000 +0100
@@ -49,7 +49,7 @@
 #define	EXPORT_SYMTAB
 #endif
 
-#include <linux/config.h>
+//#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
Only in madwifi-ng-r1605-20060527-mario/net80211: Module.symvers