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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 13 years ago 76159c20 219c6734

+2 -2

2 changed files

expand all

drivers

hwmon

coretemp.c

via-cputemp.c

+1 -1

drivers/hwmon/coretemp.c

··· 793 793 .notifier_call = coretemp_cpu_callback, 794 794 }; 795 795 796 - static const struct x86_cpu_id coretemp_ids[] = { 796 + static const struct x86_cpu_id __initconst coretemp_ids[] = { 797 797 { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM }, 798 798 {} 799 799 };

+1 -1

drivers/hwmon/via-cputemp.c

··· 309 309 .notifier_call = via_cputemp_cpu_callback, 310 310 }; 311 311 312 - static const struct x86_cpu_id cputemp_ids[] = { 312 + static const struct x86_cpu_id __initconst cputemp_ids[] = { 313 313 { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */ 314 314 { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */ 315 315 { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */