diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:19:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:19:50 +0200 |
commit | 446d27338d3b422dd3dfe496d0f362230994d059 (patch) | |
tree | 3452a8c7c487675020b2a2137635bc7dfede57fe /arch/x86/kernel/cpu/intel_64.c | |
parent | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (diff) | |
parent | 0a488a53d7ca46ac638c30079072c57e50cfcc7b (diff) | |
download | blackbird-op-linux-446d27338d3b422dd3dfe496d0f362230994d059.tar.gz blackbird-op-linux-446d27338d3b422dd3dfe496d0f362230994d059.zip |
Merge branch 'x86/cpu' into x86/core
Diffstat (limited to 'arch/x86/kernel/cpu/intel_64.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c index 1019c58d39f0..0a8128a240df 100644 --- a/arch/x86/kernel/cpu/intel_64.c +++ b/arch/x86/kernel/cpu/intel_64.c @@ -90,6 +90,7 @@ static struct cpu_dev intel_cpu_dev __cpuinitdata = { .c_ident = { "GenuineIntel" }, .c_early_init = early_init_intel, .c_init = init_intel, + .c_x86_vendor = X86_VENDOR_INTEL, }; -cpu_vendor_dev_register(X86_VENDOR_INTEL, &intel_cpu_dev); +cpu_dev_register(intel_cpu_dev); |