};
#if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2436,7 +2443,7 @@
+@@ -2453,7 +2453,11 @@
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
-- wait_for_xmitr(up, UART_LSR_THRE);
++#ifdef CONFIG_AR7
+ wait_for_xmitr(up, BOTH_EMPTY);
++#else
+ wait_for_xmitr(up, UART_LSR_THRE);
++#endif
serial_out(up, UART_TX, ch);
}
diff -urN linux-2.6.22.orig/include/linux/serialP.h linux-2.6.22/include/linux/serialP.h
--- linux-2.6.22.orig/include/linux/serialP.h 2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/include/linux/serialP.h 2007-07-11 03:08:57.000000000 +0200
-@@ -135,6 +135,9 @@
+@@ -135,6 +135,10 @@
* the interrupt line _up_ instead of down, so if we register the IRQ
* while the UART is in that state, we die in an IRQ storm. */
#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#elif defined(CONFIG_AR7)
+/* This is how it is set up by bootloader... */
-+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR)
++#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
++ | UART_MCR_RTS | UART_MCR_DTR)
#else
#define ALPHA_KLUDGE_MCR 0
#endif
-diff -urN linux-2.6.22.orig/scripts/setlocalversion linux-2.6.22/scripts/setlocalversion
---- linux-2.6.22.orig/scripts/setlocalversion 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/scripts/setlocalversion 2007-07-11 03:08:57.000000000 +0200
-@@ -1,6 +1,8 @@
- #!/bin/sh
- # Print additional version information for non-release trees.
-
-+exit 0
-+
- usage() {
- echo "Usage: $0 [srctree]" >&2
- exit 1