--- linux-2.5.30/drivers/serial/8250.c	Sat Aug  3 21:28:41 2002
+++ linux-2.5.30-rmap-slablru/drivers/serial/8250.c	Mon Aug  5 22:46:48 2002
@@ -31,7 +31,8 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/serial_reg.h>
-#include <linux/serialP.h>
+#include <linux/circ_buf.h>
+#include <linux/serial.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
--- linux-2.5.30/drivers/serial/8250.h	Fri Jul 26 22:26:07 2002
+++ linux-2.5.30-rmap-slablru/drivers/serial/8250.h	Mon Aug  5 22:47:16 2002
@@ -59,3 +59,14 @@
 #else
 #define SERIAL8250_SHARE_IRQS 0
 #endif
+
+#if defined(__alpha__) && !defined(CONFIG_PCI)
+/*
+ * Digital did something really horribly wrong with the OUT1 and OUT2
+ * lines on at least some ALPHA's. The failure mode is that if either
+ * is cleared, the machine locks up with endless interrupts.
+ */
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1)
+#else
+#define ALPHA_KLUDGE_MCR 0
+#endif