diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:01 -0500 |
| commit | a4c80d2ae2cac531c6655f75658dae02c488abc7 (patch) | |
| tree | c6fe673620faf4b793064a9b2de17f70b7b69286 /arch | |
| parent | 76be895001f2b0bee42a7685e942d3e08d5dd46c (diff) | |
| parent | 5b2afff23ab7f34222398fc357253c1e5caed363 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Spelling fixes
[SPARC64]: Spelling fixes
[SPARC64]: Fix OOPS in dma_sync_*_for_device()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index fe562db475e9..7452269bba2a 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson, | 5 | * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson, |
| 6 | * and David Mosberger. | 6 | * and David Mosberger. |
| 7 | * | 7 | * |
| 8 | * Added Linux support -miguel (weird, eh?, the orignal code was meant | 8 | * Added Linux support -miguel (weird, eh?, the original code was meant |
| 9 | * to emulate SunOS). | 9 | * to emulate SunOS). |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index 9546ba9f5dee..e752e75cce83 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
| @@ -850,7 +850,7 @@ static int pbm_routes_this_ino(struct pci_pbm_info *pbm, u32 ino) | |||
| 850 | /* How the Tomatillo IRQs are routed around is pure guesswork here. | 850 | /* How the Tomatillo IRQs are routed around is pure guesswork here. |
| 851 | * | 851 | * |
| 852 | * All the Tomatillo devices I see in prtconf dumps seem to have only | 852 | * All the Tomatillo devices I see in prtconf dumps seem to have only |
| 853 | * a single PCI bus unit attached to it. It would seem they are seperate | 853 | * a single PCI bus unit attached to it. It would seem they are separate |
| 854 | * devices because their PortID (ie. JBUS ID) values are all different | 854 | * devices because their PortID (ie. JBUS ID) values are all different |
| 855 | * and thus the registers are mapped to totally different locations. | 855 | * and thus the registers are mapped to totally different locations. |
| 856 | * | 856 | * |