--- trunk/Makefile.old	2007-10-19 14:42:10.000000000 -0400
+++ trunk/Makefile	2007-10-19 14:48:33.000000000 -0400
@@ -50,7 +50,7 @@
 include $(TOP)/Makefile.inc
 endif
 
-DIRS_MODULES = $(ATH) $(ATH_HAL) $(ATH_RATE) $(WLAN)
+DIRS_MODULES = $(ATH) $(ATH_HAL) $(ATH_RATE) $(WLAN) $(if $(MMIOTRACE),mmiotrace/)
 
 obj-y := ath/ ath_hal/ ath_rate/ net80211/ $(if $(MMIOTRACE),mmiotrace/)
 
--- trunk/mmiotrace/mmio-mod.c.old	2007-10-19 15:01:41.000000000 -0400
+++ trunk/mmiotrace/mmio-mod.c	2007-10-19 15:01:51.000000000 -0400
@@ -65,8 +65,8 @@
 /*#define MAX_EVENT_SIZE	256*/
 
 /* app data */
-static int suspended = 0;
-static struct proc_dir_entry *proc_marker_file;
+//static int suspended = 0;
+//static struct proc_dir_entry *proc_marker_file;
 
 /* module parameters */
 static unsigned long filter_offset = 0;
--- trunk/ath_hal/Makefile.old	2007-10-19 15:18:48.000000000 -0400
+++ trunk/ath_hal/Makefile	2007-10-19 15:19:17.000000000 -0400
@@ -97,6 +97,7 @@
 install:
 	test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
 	install ath_hal.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
+	install alq.$(KMODSUF) $(DESTDIR)/$(KMODPATH)
 
 clean:
 	rm -f *~ *.o *.ko *.mod.c uudecode .*.cmd
--- trunk/mmiotrace/Makefile.old	2007-10-19 15:38:36.000000000 -0400
+++ trunk/mmiotrace/Makefile	2007-10-19 15:38:45.000000000 -0400
@@ -1,4 +1,15 @@
+ifeq ($(obj),)
+obj=    .
+endif
+TOP = $(obj)/..
+include $(TOP)/Makefile.inc
+
+INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) -I$(WLAN)
+EXTRA_CFLAGS+= $(INCS) $(COPTS) -DOPT_AH_H=\"public/$(TARGET).opt_ah.h\"
+
 obj-m := mmio.o
 mmio-objs := mmio-mod.o pf_in.o kmmio.o
 
-
+install:
+	test -d $(DESTDIR)/$(KMODPATH) || mkdir -p $(DESTDIR)/$(KMODPATH)
+	install mmio.$(KMODSUF) $(DESTDIR)/$(KMODPATH)