diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /arch/powerpc/kernel/cputable.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
| download | op-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.zip op-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.tar.gz | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 9556be9..87aa0f3 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -1840,7 +1840,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_cpu_type = "ppc/e500mc", .oprofile_type = PPC_OPROFILE_FSL_EMB, .cpu_setup = __setup_cpu_e500mc, - .machine_check = machine_check_e500, + .machine_check = machine_check_e500mc, .platform = "ppce500mc", }, { /* default match */ |
