Commit 76159c20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull a howmon update from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: struct x86_cpu_id arrays can be __initconst
parents 219c6734 e273bd98

drivers/hwmon/coretemp.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ static struct notifier_block coretemp_cpu_notifier __refdata = { 
	.notifier_call = coretemp_cpu_callback,

};



static const struct x86_cpu_id coretemp_ids[] = {

static const struct x86_cpu_id __initconst coretemp_ids[] = {

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },

	{}

};

drivers/hwmon/via-cputemp.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static struct notifier_block via_cputemp_cpu_notifier __refdata = { 
	.notifier_call = via_cputemp_cpu_callback,

};



static const struct x86_cpu_id cputemp_ids[] = {

static const struct x86_cpu_id __initconst cputemp_ids[] = {

	{ X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */

	{ X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */

	{ X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */