diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 18:42:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 18:42:43 +0200 |
| commit | 203f3394397642f2f9d9ee760f03420459b7a8ef (patch) | |
| tree | 75fdd447e2cebd0919988f42a2f34c5fbe9923d8 /arch/sh/kernel/early_printk.c | |
| parent | Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 (diff) | |
| parent | sh: remove extraneous ; on scif_sercon_putc wait loop (diff) | |
| download | linux-203f3394397642f2f9d9ee760f03420459b7a8ef.tar.xz linux-203f3394397642f2f9d9ee760f03420459b7a8ef.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: remove extraneous ; on scif_sercon_putc wait loop
sh: Add missing dma_sync_single_range_for_*().
sh: panic on machvec section misalignment.
sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata().
Diffstat (limited to 'arch/sh/kernel/early_printk.c')
| -rw-r--r-- | arch/sh/kernel/early_printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index 9833493d8867..80b637c30203 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c @@ -76,7 +76,7 @@ static void scif_sercon_putc(int c) sci_in(&scif_port, SCxSR); sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); - while ((sci_in(&scif_port, SCxSR) & 0x40) == 0); + while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) ; if (c == '\n') |