--- linux-2.4.x/include/asm-m68knommu/MC68VZ328.h	Sun Mar  3 00:41:50 2002
+++ linux-2.4.x-new/include/asm-m68knommu/MC68VZ328.h	Sun Mar  3 00:49:34 2002
@@ -251,6 +251,8 @@
 #define SAM_IRQ_NUM	22	/* Sampling Timer for RTC */
 #define EMIQ_IRQ_NUM	23	/* Emulator Interrupt */
 
+#define SPI_IRQ_NUM	SPI2_IRQ_NUM
+
 /* '328-compatible definitions */
 #define SPIM_IRQ_NUM	SPI_IRQ_NUM
 #define TMR1_IRQ_NUM	TMR_IRQ_NUM
@@ -259,7 +261,7 @@
 /* 
  * Here go the bitmasks themselves
  */
-#define IMR_MSPI 	(1 << SPI _IRQ_NUM)	/* Mask SPI interrupt */
+#define IMR_MSPI 	(1 << SPI_IRQ_NUM)	/* Mask SPI interrupt */
 #define	IMR_MTMR	(1 << TMR_IRQ_NUM)	/* Mask Timer interrupt */
 #define IMR_MUART	(1 << UART_IRQ_NUM)	/* Mask UART interrupt */	
 #define	IMR_MWDT	(1 << WDT_IRQ_NUM)	/* Mask Watchdog Timer interrupt */
@@ -288,7 +290,7 @@
 #define ISR_ADDR	0xfffff30c
 #define ISR		LONG_REF(ISR_ADDR)
 
-#define ISR_SPI 	(1 << SPI _IRQ_NUM)	/* SPI interrupt */
+#define ISR_SPI 	(1 << SPI_IRQ_NUM)	/* SPI interrupt */
 #define	ISR_TMR		(1 << TMR_IRQ_NUM)	/* Timer interrupt */
 #define ISR_UART	(1 << UART_IRQ_NUM)	/* UART interrupt */	
 #define	ISR_WDT		(1 << WDT_IRQ_NUM)	/* Watchdog Timer interrupt */
@@ -317,7 +319,7 @@
 #define IPR_ADDR	0xfffff30c
 #define IPR		LONG_REF(IPR_ADDR)
 
-#define IPR_SPI 	(1 << SPI _IRQ_NUM)	/* SPI interrupt */
+#define IPR_SPI 	(1 << SPI_IRQ_NUM)	/* SPI interrupt */
 #define	IPR_TMR		(1 << TMR_IRQ_NUM)	/* Timer interrupt */
 #define IPR_UART	(1 << UART_IRQ_NUM)	/* UART interrupt */	
 #define	IPR_WDT		(1 << WDT_IRQ_NUM)	/* Watchdog Timer interrupt */
@@ -822,6 +824,8 @@
   } utx;
   volatile unsigned short int umisc  __attribute__((packed));
   volatile unsigned short int nipr   __attribute__((packed));
+  volatile unsigned short int hmark  __attribute__((packed));
+  volatile unsigned short int unused __attribute__((packed));
 } m68328_uart;