Commit 48ce3b7c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'f3cae355' into next 

Merge Linus tree to get "cpufreq, powernv: Fix build failure on UP"
to avoid build breakages in some of my test configs.
parents 7f06f21d f3cae355

drivers/cpufreq/powernv-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <asm/cputhreads.h>

#include <asm/reg.h>

#include <asm/smp.h> /* Required for cpu_sibling_mask() in UP configs */



#define POWERNV_MAX_PSTATES	256

drivers/cpufreq/unicore2-cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ static int __init ucv2_cpu_init(struct cpufreq_policy *policy) 
	policy->max = policy->cpuinfo.max_freq = 1000000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	policy->clk = clk_get(NULL, "MAIN_CLK");

	if (IS_ERR(policy->clk))

		return PTR_ERR(policy->clk);

	return 0;

	return PTR_ERR_OR_ZERO(policy->clk);

}



static struct cpufreq_driver ucv2_driver = {