diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/powerpc/oprofile/op_model_power4.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/powerpc/oprofile/op_model_power4.c')
| -rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 80774092db7..8ee51a252cf 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c | |||
| @@ -207,7 +207,7 @@ static unsigned long get_pc(struct pt_regs *regs) | |||
| 207 | unsigned long mmcra; | 207 | unsigned long mmcra; |
| 208 | unsigned long slot; | 208 | unsigned long slot; |
| 209 | 209 | ||
| 210 | /* Cant do much about it */ | 210 | /* Can't do much about it */ |
| 211 | if (!cur_cpu_spec->oprofile_mmcra_sihv) | 211 | if (!cur_cpu_spec->oprofile_mmcra_sihv) |
| 212 | return pc; | 212 | return pc; |
| 213 | 213 | ||