diff --git a/prog/hotplug/Makefile b/prog/hotplug/Makefile
index 0e457898..b154c582 100644
--- a/prog/hotplug/Makefile
+++ b/prog/hotplug/Makefile
@@ -1,9 +1,10 @@
 INCLUDEDIR = /usr/include
-#CFLAGS := -D__KERNEL__ -DMODULE -DLINUX -O2 -Wall -I$(INCLUDEDIR)
-CC := gcc
 
 # Compile with Debugging turned on - watch out, lots of pci device infos.
 CFLAGS = -D__KERNEL__ -DMODULE -DLINUX -DM7101_DEBUG -O2 -Wall -I$(INCLUDEDIR)
+# CFLAGS := -D__KERNEL__ -DMODULE -DLINUX -O2 -Wall -I$(INCLUDEDIR)
+
+CC := gcc
 LD := ld
 
 # extract versionnumber from version.h
diff --git a/prog/hotplug/m7101.c b/prog/hotplug/m7101.c
index 9bbf5e70..81691436 100644
--- a/prog/hotplug/m7101.c
+++ b/prog/hotplug/m7101.c
@@ -101,10 +101,10 @@
 #define SMB_BASE 0x1
 static u32 acpi_io = 0xEC00;	/* Set I/O Base defaults here */
 static u32 smb_io  = 0xE800;
-static int debug = 0;
 MODULE_PARM(acpi_io, "l"); 
 MODULE_PARM(smb_io, "l");
 #ifdef M7101_DEBUG
+static int debug = 0;
 MODULE_PARM(debug, "i");
 #endif
 
@@ -282,8 +282,8 @@ int init_module(void)
 #ifdef M7101_DEBUG
 		if(debug)
 		{
-			pci_remove_device(dev);
 			printk("m7101: removing device for testing\n");
+			pci_remove_device(dev);
 			m7101_inserted = 0;
 			return 0;
 		}