diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
| commit | f3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch) | |
| tree | b4702cbdbf2c4517a5986bbaa971495b0f92a877 /arch/mips/oprofile/op_model_rm9000.c | |
| parent | 5bafd76593f060540acbea3b61e3087e009aa269 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/oprofile/op_model_rm9000.c')
| -rw-r--r-- | arch/mips/oprofile/op_model_rm9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c index 9b75e41c78ef..b7063fefa65b 100644 --- a/arch/mips/oprofile/op_model_rm9000.c +++ b/arch/mips/oprofile/op_model_rm9000.c | |||
| @@ -126,7 +126,7 @@ static void rm9000_exit(void) | |||
| 126 | free_irq(rm9000_perfcount_irq, NULL); | 126 | free_irq(rm9000_perfcount_irq, NULL); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | struct op_mips_model op_model_rm9000 = { | 129 | struct op_mips_model op_model_rm9000_ops = { |
| 130 | .reg_setup = rm9000_reg_setup, | 130 | .reg_setup = rm9000_reg_setup, |
| 131 | .cpu_setup = rm9000_cpu_setup, | 131 | .cpu_setup = rm9000_cpu_setup, |
| 132 | .init = rm9000_init, | 132 | .init = rm9000_init, |