Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe4979a authored by Tom Gall's avatar Tom Gall Committed by Alistair Strachan
Browse files

Fix merge issue with 4.4.177 



Change global_attr to kobj_attribute to keep up with change in
symbol name (drivers/cpufreq/cpufreq_governor.h) that came in via
LTS.

Signed-off-by: default avatarTom Gall <tom.gall@linaro.org>
Link: https://github.com/tom-gall/hikey-linaro/commit/5ea186d035e346383f18ce189214b315d60f1316


Change-Id: I672f2a8016038790d134b45437571a4d68d73f42
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent aa922bed

drivers/cpufreq/cpufreq_interactive.c

+2 −2
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ show_store_gov_pol_sys(boostpulse_duration); 
show_store_gov_pol_sys(io_is_busy);



#define gov_sys_attr_rw(_name)						\

static struct global_attr _name##_gov_sys =				\

static struct kobj_attribute _name##_gov_sys =				\

__ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys)



#define gov_pol_attr_rw(_name)						\
@@ -1063,7 +1063,7 @@ gov_sys_pol_attr_rw(boost); 
gov_sys_pol_attr_rw(boostpulse_duration);

gov_sys_pol_attr_rw(io_is_busy);



static struct global_attr boostpulse_gov_sys =

static struct kobj_attribute boostpulse_gov_sys =

	__ATTR(boostpulse, 0200, NULL, store_boostpulse_gov_sys);



static struct freq_attr boostpulse_gov_pol =