diff --git a/[refs] b/[refs]
index 147b120626f6..efd3d038aa96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d175a4b249235927d75fb681484bd97cc4ea41
+refs/heads/master: 2424f549020b6f87ea3b6e89fd7bd26ddf1f717b
diff --git a/trunk/arch/m68k/include/asm/m5249sim.h b/trunk/arch/m68k/include/asm/m5249sim.h
index 3e31508619c1..7f0c2c3660fd 100644
--- a/trunk/arch/m68k/include/asm/m5249sim.h
+++ b/trunk/arch/m68k/include/asm/m5249sim.h
@@ -79,6 +79,17 @@
 #define MCFUART_BASE0		(MCF_MBAR + 0x1c0)	/* Base address UART0 */
 #define MCFUART_BASE1		(MCF_MBAR + 0x200)	/* Base address UART1 */
 
+/*
+ *	QSPI module.
+ */
+#define	MCFQSPI_BASE		(MCF_MBAR + 0x300)	/* Base address QSPI */
+#define	MCFQSPI_SIZE		0x40			/* Register set size */
+
+#define	MCFQSPI_CS0		29
+#define	MCFQSPI_CS1		24
+#define	MCFQSPI_CS2		21
+#define	MCFQSPI_CS3		22
+
 /*
  *	DMA unit base addresses.
  */
diff --git a/trunk/arch/m68k/include/asm/mcfqspi.h b/trunk/arch/m68k/include/asm/mcfqspi.h
index 62148b72825e..e9a7e1a2c995 100644
--- a/trunk/arch/m68k/include/asm/mcfqspi.h
+++ b/trunk/arch/m68k/include/asm/mcfqspi.h
@@ -23,8 +23,6 @@
 
 #if defined(CONFIG_M527x) || defined(CONFIG_M528x)
 #define	MCFQSPI_IOBASE		(MCF_IPSBAR + 0x340)
-#elif defined(CONFIG_M5249)
-#define MCFQSPI_IOBASE         (MCF_MBAR + 0x300)
 #elif defined(CONFIG_M532x)
 #define MCFQSPI_IOBASE         0xFC058000
 #endif
diff --git a/trunk/arch/m68k/platform/5249/config.c b/trunk/arch/m68k/platform/5249/config.c
index 58dc2c9c186d..1e176376010b 100644
--- a/trunk/arch/m68k/platform/5249/config.c
+++ b/trunk/arch/m68k/platform/5249/config.c
@@ -48,8 +48,8 @@ static struct platform_device m5249_smc91x = {
 #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
 static struct resource m5249_qspi_resources[] = {
 	{
-		.start		= MCFQSPI_IOBASE,
-		.end		= MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1,
+		.start		= MCFQSPI_BASE,
+		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,
 		.flags		= IORESOURCE_MEM,
 	},
 	{
@@ -59,11 +59,6 @@ static struct resource m5249_qspi_resources[] = {
 	},
 };
 
-#define MCFQSPI_CS0    29
-#define MCFQSPI_CS1    24
-#define MCFQSPI_CS2    21
-#define MCFQSPI_CS3    22
-
 static int m5249_cs_setup(struct mcfqspi_cs_control *cs_control)
 {
 	int status;