aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 15:54:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 15:54:17 -0400
commit9a9136e270af14da506f66bcafcc506b86a86498 (patch)
treeb4d0a6877d92635134b7a944d0032fbc43227fd2 /include/asm-powerpc
parent3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff)
parent7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits) sound: convert "sound" subdirectory to UTF-8 MAINTAINERS: Add cxacru website/mailing list include files: convert "include" subdirectory to UTF-8 general: convert "kernel" subdirectory to UTF-8 documentation: convert the Documentation directory to UTF-8 Convert the toplevel files CREDITS and MAINTAINERS to UTF-8. remove broken URLs from net drivers' output Magic number prefix consistency change to Documentation/magic-number.txt trivial: s/i_sem /i_mutex/ fix file specification in comments drivers/base/platform.c: fix small typo in doc misc doc and kconfig typos Remove obsolete fat_cvf help text Fix occurrences of "the the " Fix minor typoes in kernel/module.c Kconfig: Remove reference to external mqueue library Kconfig: A couple of grammatical fixes in arch/i386/Kconfig Correct comments in genrtc.c to refer to correct /proc file. Fix more "deprecated" spellos. Fix "deprecated" typoes. ... Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/ppc-pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index d74b2965bb82..6dcd7a811fe1 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -64,7 +64,7 @@ struct pci_dev *pci_get_device_by_addr(unsigned long addr);
64 * eeh_slot_error_detail -- record and EEH error condition to the log 64 * eeh_slot_error_detail -- record and EEH error condition to the log
65 * @severity: 1 if temporary, 2 if permanent failure. 65 * @severity: 1 if temporary, 2 if permanent failure.
66 * 66 *
67 * Obtains the the EEH error details from the RTAS subsystem, 67 * Obtains the EEH error details from the RTAS subsystem,
68 * and then logs these details with the RTAS error log system. 68 * and then logs these details with the RTAS error log system.
69 */ 69 */
70void eeh_slot_error_detail (struct pci_dn *pdn, int severity); 70void eeh_slot_error_detail (struct pci_dn *pdn, int severity);