Merge bk://linux-dj.bkbits.net/cpufreq

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/i386/kernel/cpu/cpufreq/longhaul.c

@@ -525,9 +525,6 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy)
 {
 	struct cpuinfo_x86 *c = cpu_data;
 
-	if ((c->x86_vendor != X86_VENDOR_CENTAUR) || (c->x86 !=6) )
-		return -ENODEV;
-
 	switch (c->x86_model) {
 	case 6:		/* VIA C3 Samuel C5A */
 		longhaul=1;

arch/i386/kernel/cpu/cpufreq/longrun.c

@@ -229,9 +229,6 @@ static int longrun_cpu_init(struct cpufreq_policy *policy)
 	/* capability check */
 	if (policy->cpu != 0)
 		return -ENODEV;
-	if (c->x86_vendor != X86_VENDOR_TRANSMETA || 
-	    !cpu_has(c, X86_FEATURE_LONGRUN))
-		return -ENODEV;
 
 	/* detect low and high frequency */
 	result = longrun_determine_freqs(&longrun_low_freq, &longrun_high_freq);

arch/i386/kernel/cpu/cpufreq/p4-clockmod.c

@@ -180,13 +180,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
 	int cpuid = 0;
 	unsigned int i;
 
-	/* capability check */
-	if (c->x86_vendor != X86_VENDOR_INTEL)
-		return -ENODEV;
-	if (!test_bit(X86_FEATURE_ACPI, c->x86_capability) ||
-	    !test_bit(X86_FEATURE_ACC, c->x86_capability))
-		return -ENODEV;
-	
 	/* Errata workaround */
 	cpuid = (c->x86 << 8) | (c->x86_model << 4) | c->x86_mask;
 	switch (cpuid) {

arch/i386/kernel/cpu/cpufreq/powernow-k6.c

@@ -145,10 +145,6 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
 	struct cpuinfo_x86 *c = cpu_data;
 	unsigned int i;
 
-	/* capability check */
-	if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 5) ||
-	    ((c->x86_model != 12) && (c->x86_model != 13)))
-		return -ENODEV;
 	if (policy->cpu != 0)
 		return -ENODEV;
 

kernel/cpufreq.c

@@ -46,7 +46,7 @@ static struct notifier_block    *cpufreq_transition_notifier_list;
 static DECLARE_RWSEM		(cpufreq_notifier_rwsem);
 
 
-LIST_HEAD(cpufreq_governor_list);
+static LIST_HEAD(cpufreq_governor_list);
 static DECLARE_MUTEX		(cpufreq_governor_sem);
 
 static struct device_interface cpufreq_interface;