diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /arch/sh/oprofile/common.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/sh/oprofile/common.c')
| -rw-r--r-- | arch/sh/oprofile/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/oprofile/common.c b/arch/sh/oprofile/common.c index 1d97d64cb95f..1b9d4304b3bf 100644 --- a/arch/sh/oprofile/common.c +++ b/arch/sh/oprofile/common.c | |||
| @@ -107,6 +107,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 107 | case CPU_SH7780: | 107 | case CPU_SH7780: |
| 108 | case CPU_SH7781: | 108 | case CPU_SH7781: |
| 109 | case CPU_SH7785: | 109 | case CPU_SH7785: |
| 110 | case CPU_SH7786: | ||
| 110 | case CPU_SH7723: | 111 | case CPU_SH7723: |
| 111 | case CPU_SHX3: | 112 | case CPU_SHX3: |
| 112 | lmodel = &op_model_sh4a_ops; | 113 | lmodel = &op_model_sh4a_ops; |