diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
| commit | 33d444f182a1757640077c6b7381e54c13142b1d (patch) | |
| tree | 106bf7bdd645c2efd645ff3973fcfd64d41cfce8 /arch/sparc/prom/printf.c | |
| parent | ae7d5c8622a518601a21f14de5c70de5f1c967bf (diff) | |
| parent | 8354c5b72636e5321e9b16dae1da1445506f6af6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
[SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
[SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
[SPARC64]: envctrl.c needs asm/io.h
[SPARC64]: Update defconfig.
[TTY]: Export proc_clear_tty() to modulea.
[SPARC64]: pci_resource_adjust() cannot be __init.
[SPARC64]: Spelling fixes.
[SPARC]: Spelling fixes.
[SPARC64]: Kill LARGE_ALLOCS and update defconfig.
Diffstat (limited to 'arch/sparc/prom/printf.c')
| -rw-r--r-- | arch/sparc/prom/printf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c index dc8b598bedb..27fdac99f79 100644 --- a/arch/sparc/prom/printf.c +++ b/arch/sparc/prom/printf.c @@ -5,7 +5,7 @@ * Copyright (c) 2002 Pete Zaitcev (zaitcev@yahoo.com) * * We used to warn all over the code: DO NOT USE prom_printf(), - * and yet people do. Anton's banking code was outputing banks + * and yet people do. Anton's banking code was outputting banks * with prom_printf for most of the 2.4 lifetime. Since an effective * stick is not available, we deployed a carrot: an early printk * through PROM by means of -p boot option. This ought to fix it. |