Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / cpufreq / gx-suspmod.c

diff --git a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
index 2ed7db2fd257b3a25c78dd61dd48683bb60a49f7..9d9eae82e60fae3baec7333269ddb6c46b7d1d27 100644 (file)
--- a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
@@ -181,8 +181,8 @@ static __init struct pci_dev *gx_detect_chipset(void)
        struct pci_dev *gx_pci = NULL;
 
        /* check if CPU is a MediaGX or a Geode. */
-       if ((current_cpu_data.x86_vendor != X86_VENDOR_NSC) &&
-           (current_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {
+       if ((boot_cpu_data.x86_vendor != X86_VENDOR_NSC) &&
+           (boot_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {
                dprintk("error: no MediaGX/Geode processor found!\n");
                return NULL;
        }