Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[cascardo/linux.git] / drivers / hwmon / w83627ehf.c

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index a25350c..54922ed 100644 (file)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -2619,15 +2619,15 @@ static struct platform_driver w83627ehf_driver = {
 static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
                                 struct w83627ehf_sio_data *sio_data)
 {
-       static const char __initdata sio_name_W83627EHF[] = "W83627EHF";
-       static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
-       static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
-       static const char __initdata sio_name_W83627DHG_P[] = "W83627DHG-P";
-       static const char __initdata sio_name_W83627UHG[] = "W83627UHG";
-       static const char __initdata sio_name_W83667HG[] = "W83667HG";
-       static const char __initdata sio_name_W83667HG_B[] = "W83667HG-B";
-       static const char __initdata sio_name_NCT6775[] = "NCT6775F";
-       static const char __initdata sio_name_NCT6776[] = "NCT6776F";
+       static const char sio_name_W83627EHF[] __initconst = "W83627EHF";
+       static const char sio_name_W83627EHG[] __initconst = "W83627EHG";
+       static const char sio_name_W83627DHG[] __initconst = "W83627DHG";
+       static const char sio_name_W83627DHG_P[] __initconst = "W83627DHG-P";
+       static const char sio_name_W83627UHG[] __initconst = "W83627UHG";
+       static const char sio_name_W83667HG[] __initconst = "W83667HG";
+       static const char sio_name_W83667HG_B[] __initconst = "W83667HG-B";
+       static const char sio_name_NCT6775[] __initconst = "NCT6775F";
+       static const char sio_name_NCT6776[] __initconst = "NCT6776F";
 
        u16 val;
        const char *sio_name;