diff -urN user/qspitest/qspi.c user/qspitest/qspi.c
--- user/qspitest/qspi.c	2008-06-11 20:21:03.000000000 -0400
+++ user/qspitest/qspi.c	2008-09-12 14:45:27.000000000 -0400
@@ -51,8 +51,7 @@
 #include <getopt.h>
 
 #include <asm/coldfire.h>
-#include <asm/mcfqspi.h>
-#include <asm/mcfsim.h>
+#include <asm/mcf_qspi.h>
 
 #define _DECLARE_
 #include "qspi.h"
diff -urN user/qspitest/qspirx.c user/qspitest/qspirx.c
--- user/qspitest/qspirx.c	2007-08-22 01:43:12.000000000 -0400
+++ user/qspitest/qspirx.c	2008-09-16 19:34:28.000000000 -0400
@@ -43,7 +43,7 @@
 #include <getopt.h>
 
 #include <asm/coldfire.h>
-#include <asm/mcfqspi.h>
+#include <asm/mcf_qspi.h>
 #include <asm/mcfsim.h>
 
 #include "qspi.h"
@@ -90,7 +90,7 @@
 		exit(-EINVAL);
 	}
 	baud_divider =
-	    (int)(((double)MCF_CLK / (2.0 * (double)opt_baud)) + 0.5);
+	    (int)(((double)MCF_BUSCLK / (2.0 * (double)opt_baud)) + 0.5);
 	if (ioctl(serialPort, QSPIIOCS_BAUD, baud_divider)) {
 		perror("QSPIIOCS_BAUD");
 		exit(-EINVAL);
diff -urN user/qspitest/qspitest.c user/qspitest/qspitest.c
--- user/qspitest/qspitest.c	2007-08-22 01:43:12.000000000 -0400
+++ user/qspitest/qspitest.c	2008-09-16 19:34:45.000000000 -0400
@@ -51,7 +51,7 @@
 #include <getopt.h>
 
 #include <asm/coldfire.h>
-#include <asm/mcfqspi.h>
+#include <asm/mcf_qspi.h>
 #include <asm/mcfsim.h>
 
 #define DEBUG 1
@@ -104,7 +104,7 @@
 		exit(-EINVAL);
 	}
 	baud_divider =
-	    (int)(((double)MCF_CLK / (2.0 * (double)opt_baud)) + 0.5);
+	    (int)(((double)MCF_BUSCLK / (2.0 * (double)opt_baud)) + 0.5);
 	if (ioctl(serialPort, QSPIIOCS_BAUD, baud_divider)) {
 		perror("QSPIIOCS_BAUD");
 		exit(-EINVAL);