diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 22:43:08 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 22:43:08 (GMT) |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /arch/i386/kernel/cpu/centaur.c | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
| download | linux-fsl-qoriq-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'arch/i386/kernel/cpu/centaur.c')
| -rw-r--r-- | arch/i386/kernel/cpu/centaur.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/i386/kernel/cpu/centaur.c b/arch/i386/kernel/cpu/centaur.c index 394814e..f52669e 100644 --- a/arch/i386/kernel/cpu/centaur.c +++ b/arch/i386/kernel/cpu/centaur.c @@ -405,10 +405,6 @@ static void __init init_centaur(struct cpuinfo_x86 *c) winchip2_protect_mcr(); #endif break; - case 10: - name="4"; - /* no info on the WC4 yet */ - break; default: name="??"; } @@ -474,3 +470,11 @@ int __init centaur_init_cpu(void) } //early_arch_initcall(centaur_init_cpu); + +static int __init centaur_exit_cpu(void) +{ + cpu_devs[X86_VENDOR_CENTAUR] = NULL; + return 0; +} + +late_initcall(centaur_exit_cpu); |