diff -r 7b569e2061c7 -r 30834c0f3179 libraries/extrabtrace/group/extrabtracek.mmp
--- a/libraries/extrabtrace/group/extrabtracek.mmp	Fri Jul 30 14:53:31 2010 +0100
+++ b/libraries/extrabtrace/group/extrabtracek.mmp	Fri Jul 30 17:38:41 2010 +0100
@@ -25,17 +25,20 @@
 
 sourcepath		..\src
 
-#if defined(MARM)
-	#ifdef GCCE
-		// Workaround for the gcce makmake module doing weird things with -S when compiling .cia files
-		// And for GCCE.h's definition of __NAKED__ being wrong
-		source			usampler_cia.cpp
-	#else
-		source			usampler.cia
+#ifndef SMP // Sampler not supported on smp
+	#if defined(MARM)
+		#ifdef GCCE
+			// Workaround for the gcce makmake module doing weird things with -S when compiling .cia files
+			// And for GCCE.h's definition of __NAKED__ being wrong
+			source			usampler_cia.cpp
+		#else
+			source			usampler.cia
+		#endif
 	#endif
+source			sampler.cpp
 #endif
 
-source			extrabtracek.cpp sampler.cpp
+source			extrabtracek.cpp
 source			eventhandler.cpp
 
 start wins