3 files changed, 1 insertions, 20 deletions
diff --git a/arch/m68k/include/asm/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h
index ddd8f338054..7848dbdff49 100644
--- a/arch/m68k/include/asm/coldfire/dspi.h
+++ b/arch/m68k/include/asm/coldfire/dspi.h
@@ -20,14 +20,8 @@ typedef struct dspi {
 	u32 tfr;	/* 0x34 - PUSHR */
 	u16 resv1;	/* 0x38 */
 	u16 rfr;	/* 0x3A - POPR */
-#ifdef CONFIG_MCF547x_8x
-	u32 tfdr[4];	/* 0x3C */
-	u8 resv2[0x30];	/* 0x40 */
-	u32 rfdr[4];	/* 0x7C */
-#else
 	u32 tfdr[16];	/* 0x3C */
 	u32 rfdr[16];	/* 0x7C */
-#endif
 } dspi_t;
 
 /* Module configuration */
diff --git a/arch/m68k/include/asm/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h
index 0e64bef5ed6..eb5c6663612 100644
--- a/arch/m68k/include/asm/coldfire/eport.h
+++ b/arch/m68k/include/asm/coldfire/eport.h
@@ -11,18 +11,6 @@
 
 /* Edge Port Module (EPORT) */
 typedef struct eport {
-#ifdef CONFIG_MCF547x_8x
-	u16 par;	/* 0x00 */
-	u16 res0;	/* 0x02 */
-	u8 ddr;		/* 0x04 */
-	u8 ier;		/* 0x05 */
-	u16 res1;	/* 0x06 */
-	u8 dr;		/* 0x08 */
-	u8 pdr;		/* 0x09 */
-	u16 res2;	/* 0x0A */
-	u8 fr;		/* 0x0C */
-	u8 res3[3];	/* 0x0D */
-#else
 	u16 par;	/* 0x00 Pin Assignment */
 	u8 ddr;		/* 0x02 Data Direction */
 	u8 ier;		/* 0x03 Interrupt Enable */
@@ -30,7 +18,6 @@ typedef struct eport {
 	u8 pdr;		/* 0x05 Pin Data */
 	u8 fr;		/* 0x06 Flag */
 	u8 res0;
-#endif
 } eport_t;
 
 /* EPPAR */
diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
index 7b42e65bc82..f7f0f07d30f 100644
--- a/arch/m68k/include/asm/coldfire/intctrl.h
+++ b/arch/m68k/include/asm/coldfire/intctrl.h
@@ -11,7 +11,7 @@
 
 #if defined(CONFIG_M5235) || defined(CONFIG_M5271) || \
     defined(CONFIG_M5275) || defined(CONFIG_M5282) || \
-    defined(CONFIG_M547x) || defined(CONFIG_M548x)
+    defined(CONFIG_M547x)
 #	define	CONFIG_SYS_CF_INTC_REG1
 #endif