diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/alpha/oprofile/op_impl.h | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (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 'arch/alpha/oprofile/op_impl.h')
-rw-r--r-- | arch/alpha/oprofile/op_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/oprofile/op_impl.h b/arch/alpha/oprofile/op_impl.h index 6b97893c1a80..b2b87ae9a353 100644 --- a/arch/alpha/oprofile/op_impl.h +++ b/arch/alpha/oprofile/op_impl.h | |||
@@ -38,7 +38,7 @@ struct op_register_config { | |||
38 | unsigned long need_reset; | 38 | unsigned long need_reset; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | /* Per-architecture configury and hooks. */ | 41 | /* Per-architecture configuration and hooks. */ |
42 | struct op_axp_model { | 42 | struct op_axp_model { |
43 | void (*reg_setup) (struct op_register_config *, | 43 | void (*reg_setup) (struct op_register_config *, |
44 | struct op_counter_config *, | 44 | struct op_counter_config *, |