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

Commit 807b5169 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull a hwmon fix from Guenter Roeck:
 "One patch with section conflict fixes."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  sections: Fix section conflicts in drivers/hwmon
parents 8a6b5214 64f50307

drivers/hwmon/coretemp.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ struct tjmax { 
	int tjmax;

};



static struct tjmax __cpuinitconst tjmax_table[] = {

static const struct tjmax __cpuinitconst tjmax_table[] = {

	{ "CPU D410", 100000 },

	{ "CPU D425", 100000 },

	{ "CPU D510", 100000 },

drivers/hwmon/w83627hf.c

+1 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, 
	int err = -ENODEV;

	u16 val;



	static const __initdata char *names[] = {

	static __initconst char *const names[] = {

		"W83627HF",

		"W83627THF",

		"W83697HF",