Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/sparc/prom/console.c

@@ -105,7 +105,7 @@ prom_putchar(char c)
 
 /* Query for input device type */
 enum prom_input_device
-prom_query_input_device()
+prom_query_input_device(void)
 {
 	unsigned long flags;
 	int st_p;
@@ -155,7 +155,7 @@ prom_query_input_device()
 /* Query for output device type */
 
 enum prom_output_device
-prom_query_output_device()
+prom_query_output_device(void)
 {
 	unsigned long flags;
 	int st_p;

arch/sparc64/boot/Makefile

@@ -15,7 +15,7 @@ quiet_cmd_elftoaout = ELT2AOUT $@
 quiet_cmd_piggy     = PIGGY    $@
       cmd_piggy     = $(obj)/piggyback $@ System.map $(ROOT_IMG)
 quiet_cmd_strip     = STRIP $@
-      cmd_strip     = $(STRIP) -R .comment -R .note vmlinux -o $@
+      cmd_strip     = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux -o $@
 
 
 # Actual linking

arch/sparc64/prom/console.c

@@ -76,7 +76,7 @@ prom_puts(char *s, int len)
 
 /* Query for input device type */
 enum prom_input_device
-prom_query_input_device()
+prom_query_input_device(void)
 {
 	int st_p;
 	char propb[64];
@@ -111,7 +111,7 @@ prom_query_input_device()
 /* Query for output device type */
 
 enum prom_output_device
-prom_query_output_device()
+prom_query_output_device(void)
 {
 	int st_p;
 	char propb[64];

drivers/serial/sunsab.c

@@ -231,8 +231,10 @@ static void transmit_chars(struct uart_sunsab_port *up,
 		set_bit(SAB82532_ALLS, &up->irqflags);
 	}
 
+#if 0 /* bde@nwlink.com says this check causes problems */
 	if (!(stat->sreg.isr1 & SAB82532_ISR1_XPR))
 		return;
+#endif
 
 	if (!(readb(&up->regs->r.star) & SAB82532_STAR_XFW))
 		return;
@@ -242,6 +244,7 @@ static void transmit_chars(struct uart_sunsab_port *up,
 	if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
 		up->interrupt_mask1 |= SAB82532_IMR1_XPR;
 		writeb(up->interrupt_mask1, &up->regs->w.imr1);
+		uart_write_wakeup(&up->port);
 		return;
 	}