aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/aic7xxx_old/aic7xxx.seq2
-rw-r--r--drivers/serial/nwpserial.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq
index f6fc4b75b5a5..5997e7c3a191 100644
--- a/drivers/scsi/aic7xxx_old/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq
@@ -615,7 +615,7 @@ ultra2_dmafifoflush:
615 * went empty and the next bit of data is copied from 615 * went empty and the next bit of data is copied from
616 * the SCSI fifo into the PCI fifo. It should only 616 * the SCSI fifo into the PCI fifo. It should only
617 * come on when both FIFOs (meaning the entire FIFO 617 * come on when both FIFOs (meaning the entire FIFO
618 * chain) are emtpy. Since it can take up to 4 cycles 618 * chain) are empty. Since it can take up to 4 cycles
619 * for new data to be copied from the SCSI fifo into 619 * for new data to be copied from the SCSI fifo into
620 * the PCI fifo, testing for FIFOEMP status for 4 620 * the PCI fifo, testing for FIFOEMP status for 4
621 * extra times gives the needed time for any 621 * extra times gives the needed time for any
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 3c02fa96f282..e65b0d9202a5 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -81,7 +81,7 @@ nwpserial_console_write(struct console *co, const char *s, unsigned int count)
81 81
82 uart_console_write(&up->port, s, count, nwpserial_console_putchar); 82 uart_console_write(&up->port, s, count, nwpserial_console_putchar);
83 83
84 /* wait for transmitter to become emtpy */ 84 /* wait for transmitter to become empty */
85 while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0) 85 while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0)
86 cpu_relax(); 86 cpu_relax();
87 87