aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /include/asm-powerpc
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/io.h2
-rw-r--r--include/asm-powerpc/paca.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index bf14ab4ef4c9..e44cdfc8493a 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -522,7 +522,7 @@ static inline void name at \
522#else 522#else
523/* 523/*
524 * Enforce synchronisation of stores vs. spin_unlock 524 * Enforce synchronisation of stores vs. spin_unlock
525 * (this does it explicitely, though our implementation of spin_unlock 525 * (this does it explicitly, though our implementation of spin_unlock
526 * does it implicitely too) 526 * does it implicitely too)
527 */ 527 */
528static inline void mmiowb(void) 528static inline void mmiowb(void)
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 98c6bd5756b7..f6dfce025adf 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -121,7 +121,5 @@ struct paca_struct {
121 121
122extern struct paca_struct paca[]; 122extern struct paca_struct paca[];
123 123
124void setup_boot_paca(void);
125
126#endif /* __KERNEL__ */ 124#endif /* __KERNEL__ */
127#endif /* _ASM_POWERPC_PACA_H */ 125#endif /* _ASM_POWERPC_PACA_H */