Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[~andy/linux] / arch / alpha / oprofile / op_impl.h

diff --git a/arch/alpha/oprofile/op_impl.h b/arch/alpha/oprofile/op_impl.h
index 6b97893c1a80c9547a89985298d874c2c4790f51..b2b87ae9a353a9c3370499592f0858133179d79a 100644 (file)
--- a/arch/alpha/oprofile/op_impl.h
+++ b/arch/alpha/oprofile/op_impl.h
@@ -38,7 +38,7 @@ struct op_register_config {
        unsigned long need_reset;
 };
 
-/* Per-architecture configury and hooks.  */
+/* Per-architecture configuration and hooks.  */
 struct op_axp_model {
        void (*reg_setup) (struct op_register_config *,
                           struct op_counter_config *,