Merge branch 'akpm' (Andrew's patch-bomb)

[karo-tx-linux.git] / drivers / hwmon / via-cputemp.c

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 8689664ef03cd86866aae1d868aacc55e10a95d9..ee4ebc198a9448e868f45af079e8f3d5f51968ae 100644 (file)
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -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 */