Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

arch/sparc64/kernel/us2e_cpufreq.c

@@ -314,7 +314,7 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
 	return cpufreq_frequency_table_cpuinfo(policy, table);
 }
 
-static int __exit us2e_freq_cpu_exit(struct cpufreq_policy *policy)
+static int us2e_freq_cpu_exit(struct cpufreq_policy *policy)
 {
 	if (cpufreq_us2e_driver)
 		us2e_set_cpu_divider_index(policy->cpu, 0);

arch/sparc64/kernel/us3_cpufreq.c

@@ -169,7 +169,7 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
 	return cpufreq_frequency_table_cpuinfo(policy, table);
 }
 
-static int __exit us3_freq_cpu_exit(struct cpufreq_policy *policy)
+static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
 {
 	if (cpufreq_us3_driver)
 		us3_set_cpu_divider_index(policy->cpu, 0);