From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/leds/leds-lp8860.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/drivers/leds/leds-lp8860.c') diff --git a/kernel/drivers/leds/leds-lp8860.c b/kernel/drivers/leds/leds-lp8860.c index 8c2b7fbe2..79f084354 100644 --- a/kernel/drivers/leds/leds-lp8860.c +++ b/kernel/drivers/leds/leds-lp8860.c @@ -302,7 +302,7 @@ out: return ret; } -static struct reg_default lp8860_reg_defs[] = { +static const struct reg_default lp8860_reg_defs[] = { { LP8860_DISP_CL1_BRT_MSB, 0x00}, { LP8860_DISP_CL1_BRT_LSB, 0x00}, { LP8860_DISP_CL1_CURR_MSB, 0x00}, @@ -332,7 +332,7 @@ static const struct regmap_config lp8860_regmap_config = { .cache_type = REGCACHE_NONE, }; -static struct reg_default lp8860_eeprom_defs[] = { +static const struct reg_default lp8860_eeprom_defs[] = { { LP8860_EEPROM_REG_0, 0x00 }, { LP8860_EEPROM_REG_1, 0x00 }, { LP8860_EEPROM_REG_2, 0x00 }, -- cgit 1.2.3-korg