aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/include/asm/parport.h2
-rw-r--r--arch/sparc/kernel/apc.c2
-rw-r--r--arch/sparc/kernel/pmc.c2
-rw-r--r--arch/sparc/kernel/time.c2
-rw-r--r--arch/sparc64/kernel/auxio.c2
-rw-r--r--arch/sparc64/kernel/chmc.c2
-rw-r--r--arch/sparc64/kernel/pci_fire.c2
-rw-r--r--arch/sparc64/kernel/pci_psycho.c2
-rw-r--r--arch/sparc64/kernel/pci_sabre.c2
-rw-r--r--arch/sparc64/kernel/pci_schizo.c2
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c2
-rw-r--r--arch/sparc64/kernel/power.c2
-rw-r--r--arch/sparc64/kernel/time.c6
-rw-r--r--drivers/atm/fore200e.c2
-rw-r--r--drivers/char/hw_random/n2-drv.c2
-rw-r--r--drivers/hwmon/ultra45_env.c2
-rw-r--r--drivers/input/misc/sparcspkr.c4
-rw-r--r--drivers/input/serio/i8042-sparcio.h2
-rw-r--r--drivers/mtd/maps/sun_uflash.c2
-rw-r--r--drivers/net/myri_sbus.c2
-rw-r--r--drivers/net/niu.c2
-rw-r--r--drivers/net/sunbmac.c2
-rw-r--r--drivers/net/sunhme.c2
-rw-r--r--drivers/net/sunlance.c2
-rw-r--r--drivers/net/sunqe.c2
-rw-r--r--drivers/parport/parport_sunbpp.c2
-rw-r--r--drivers/sbus/char/bbc_i2c.c2
-rw-r--r--drivers/sbus/char/display7seg.c2
-rw-r--r--drivers/sbus/char/envctrl.c2
-rw-r--r--drivers/sbus/char/flash.c2
-rw-r--r--drivers/sbus/char/uctrl.c2
-rw-r--r--drivers/scsi/qlogicpti.c2
-rw-r--r--drivers/scsi/sun_esp.c2
-rw-r--r--drivers/serial/sunhv.c2
-rw-r--r--drivers/serial/sunsab.c2
-rw-r--r--drivers/serial/sunsu.c2
-rw-r--r--drivers/serial/sunzilog.c2
-rw-r--r--drivers/video/bw2.c2
-rw-r--r--drivers/video/cg14.c2
-rw-r--r--drivers/video/cg3.c2
-rw-r--r--drivers/video/cg6.c2
-rw-r--r--drivers/video/ffb.c2
-rw-r--r--drivers/video/leo.c2
-rw-r--r--drivers/video/p9100.c2
-rw-r--r--drivers/video/tcx.c2
-rw-r--r--drivers/watchdog/cpwd.c2
-rw-r--r--drivers/watchdog/riowd.c2
-rw-r--r--sound/sparc/amd7930.c2
-rw-r--r--sound/sparc/cs4231.c2
-rw-r--r--sound/sparc/dbri.c2
50 files changed, 53 insertions, 53 deletions
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index 70dce0273f99..dff3f0253aa8 100644
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -215,7 +215,7 @@ static int __devexit ecpp_remove(struct of_device *op)
215 return 0; 215 return 0;
216} 216}
217 217
218static struct of_device_id ecpp_match[] = { 218static const struct of_device_id ecpp_match[] = {
219 { 219 {
220 .name = "ecpp", 220 .name = "ecpp",
221 }, 221 },
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 0a20cd85fd31..4dd1ba752ce6 100644
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -182,7 +182,7 @@ static int __devinit apc_probe(struct of_device *op,
182 return 0; 182 return 0;
183} 183}
184 184
185static struct of_device_id apc_match[] = { 185static struct of_device_id __initdata apc_match[] = {
186 { 186 {
187 .name = APC_OBPNAME, 187 .name = APC_OBPNAME,
188 }, 188 },
diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index 9976e82e3233..814eb3ce039b 100644
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -72,7 +72,7 @@ static int __devinit pmc_probe(struct of_device *op,
72 return 0; 72 return 0;
73} 73}
74 74
75static struct of_device_id pmc_match[] = { 75static struct of_device_id __initdata pmc_match[] = {
76 { 76 {
77 .name = PMC_OBPNAME, 77 .name = PMC_OBPNAME,
78 }, 78 },
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index a713bb43db84..339c4762fbcf 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -338,7 +338,7 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
338 return 0; 338 return 0;
339} 339}
340 340
341static struct of_device_id clock_match[] = { 341static struct of_device_id __initdata clock_match[] = {
342 { 342 {
343 .name = "eeprom", 343 .name = "eeprom",
344 }, 344 },
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c
index dd5c7bf87619..858beda86524 100644
--- a/arch/sparc64/kernel/auxio.c
+++ b/arch/sparc64/kernel/auxio.c
@@ -109,7 +109,7 @@ void auxio_set_lte(int on)
109 } 109 }
110} 110}
111 111
112static struct of_device_id auxio_match[] = { 112static struct of_device_id __initdata auxio_match[] = {
113 { 113 {
114 .name = "auxio", 114 .name = "auxio",
115 }, 115 },
diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c
index 3e14952e9407..2ed401087cab 100644
--- a/arch/sparc64/kernel/chmc.c
+++ b/arch/sparc64/kernel/chmc.c
@@ -801,7 +801,7 @@ static int __devexit us3mc_remove(struct of_device *op)
801 return 0; 801 return 0;
802} 802}
803 803
804static struct of_device_id us3mc_match[] = { 804static const struct of_device_id us3mc_match[] = {
805 { 805 {
806 .name = "memory-controller", 806 .name = "memory-controller",
807 }, 807 },
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c
index adc3fe44b081..477928aad538 100644
--- a/arch/sparc64/kernel/pci_fire.c
+++ b/arch/sparc64/kernel/pci_fire.c
@@ -547,7 +547,7 @@ out_free:
547 return err; 547 return err;
548} 548}
549 549
550static struct of_device_id fire_match[] = { 550static struct of_device_id __initdata fire_match[] = {
551 { 551 {
552 .name = "pci", 552 .name = "pci",
553 .compatible = "pciex108e,80f0", 553 .compatible = "pciex108e,80f0",
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 4e8f87aad205..708212a6e7eb 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1099,7 +1099,7 @@ out_free:
1099 return err; 1099 return err;
1100} 1100}
1101 1101
1102static struct of_device_id psycho_match[] = { 1102static struct of_device_id __initdata psycho_match[] = {
1103 { 1103 {
1104 .name = "pci", 1104 .name = "pci",
1105 .compatible = "pci108e,8000", 1105 .compatible = "pci108e,8000",
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 7cce4d8f4aae..cc476e9a275e 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -885,7 +885,7 @@ out_free:
885 return err; 885 return err;
886} 886}
887 887
888static struct of_device_id sabre_match[] = { 888static struct of_device_id __initdata sabre_match[] = {
889 { 889 {
890 .name = "pci", 890 .name = "pci",
891 .compatible = "pci108e,a001", 891 .compatible = "pci108e,a001",
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index b95dd548583a..18fdd887b4ac 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1504,7 +1504,7 @@ static int __devinit schizo_probe(struct of_device *op,
1504 * and pci108e,8001. So list the chips in reverse chronological 1504 * and pci108e,8001. So list the chips in reverse chronological
1505 * order. 1505 * order.
1506 */ 1506 */
1507static struct of_device_id schizo_match[] = { 1507static struct of_device_id __initdata schizo_match[] = {
1508 { 1508 {
1509 .name = "pci", 1509 .name = "pci",
1510 .compatible = "pci108e,a801", 1510 .compatible = "pci108e,a801",
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index c1e72beade2b..fea51a054be5 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1026,7 +1026,7 @@ out_free:
1026 return -ENOMEM; 1026 return -ENOMEM;
1027} 1027}
1028 1028
1029static struct of_device_id pci_sun4v_match[] = { 1029static struct of_device_id __initdata pci_sun4v_match[] = {
1030 { 1030 {
1031 .name = "pci", 1031 .name = "pci",
1032 .compatible = "SUNW,sun4v-pci", 1032 .compatible = "SUNW,sun4v-pci",
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 7536255ab573..7559ad395a33 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -89,7 +89,7 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id
89 return 0; 89 return 0;
90} 90}
91 91
92static struct of_device_id power_match[] = { 92static struct of_device_id __initdata power_match[] = {
93 { 93 {
94 .name = "power", 94 .name = "power",
95 }, 95 },
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index ea05038a8c16..209e7d28c3a5 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -438,7 +438,7 @@ static int __devinit rtc_probe(struct of_device *op, const struct of_device_id *
438 return platform_device_register(&rtc_cmos_device); 438 return platform_device_register(&rtc_cmos_device);
439} 439}
440 440
441static struct of_device_id rtc_match[] = { 441static struct of_device_id __initdata rtc_match[] = {
442 { 442 {
443 .name = "rtc", 443 .name = "rtc",
444 .compatible = "m5819", 444 .compatible = "m5819",
@@ -482,7 +482,7 @@ static int __devinit bq4802_probe(struct of_device *op, const struct of_device_i
482 return platform_device_register(&rtc_bq4802_device); 482 return platform_device_register(&rtc_bq4802_device);
483} 483}
484 484
485static struct of_device_id bq4802_match[] = { 485static struct of_device_id __initdata bq4802_match[] = {
486 { 486 {
487 .name = "rtc", 487 .name = "rtc",
488 .compatible = "bq4802", 488 .compatible = "bq4802",
@@ -566,7 +566,7 @@ static int __devinit mostek_probe(struct of_device *op, const struct of_device_i
566 return platform_device_register(&m48t59_rtc); 566 return platform_device_register(&m48t59_rtc);
567} 567}
568 568
569static struct of_device_id mostek_match[] = { 569static struct of_device_id __initdata mostek_match[] = {
570 { 570 {
571 .name = "eeprom", 571 .name = "eeprom",
572 }, 572 },
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index c2fa9fdc5d32..937c9c0ef4c9 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2685,7 +2685,7 @@ static int __devexit fore200e_sba_remove(struct of_device *op)
2685 return 0; 2685 return 0;
2686} 2686}
2687 2687
2688static struct of_device_id fore200e_sba_match[] = { 2688static const struct of_device_id fore200e_sba_match[] = {
2689 { 2689 {
2690 .name = SBA200E_PROM_NAME, 2690 .name = SBA200E_PROM_NAME,
2691 .data = (void *) &fore200e_bus[1], 2691 .data = (void *) &fore200e_bus[1],
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 5220f541df25..8859aeac2d25 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -736,7 +736,7 @@ static int __devexit n2rng_remove(struct of_device *op)
736 return 0; 736 return 0;
737} 737}
738 738
739static struct of_device_id n2rng_match[] = { 739static const struct of_device_id n2rng_match[] = {
740 { 740 {
741 .name = "random-number-generator", 741 .name = "random-number-generator",
742 .compatible = "SUNW,n2-rng", 742 .compatible = "SUNW,n2-rng",
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 9aec95cbf7e9..68e90abeba96 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -290,7 +290,7 @@ static int __devexit env_remove(struct of_device *op)
290 return 0; 290 return 0;
291} 291}
292 292
293static struct of_device_id env_match[] = { 293static const struct of_device_id env_match[] = {
294 { 294 {
295 .name = "env-monitor", 295 .name = "env-monitor",
296 .compatible = "SUNW,ebus-pic16f747-env", 296 .compatible = "SUNW,ebus-pic16f747-env",
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index d8765cc93d27..c4f42311fdec 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -249,7 +249,7 @@ static int bbc_remove(struct of_device *op)
249 return 0; 249 return 0;
250} 250}
251 251
252static struct of_device_id bbc_beep_match[] = { 252static const struct of_device_id bbc_beep_match[] = {
253 { 253 {
254 .name = "beep", 254 .name = "beep",
255 .compatible = "SUNW,bbc-beep", 255 .compatible = "SUNW,bbc-beep",
@@ -328,7 +328,7 @@ static int grover_remove(struct of_device *op)
328 return 0; 328 return 0;
329} 329}
330 330
331static struct of_device_id grover_beep_match[] = { 331static const struct of_device_id grover_beep_match[] = {
332 { 332 {
333 .name = "beep", 333 .name = "beep",
334 .compatible = "SUNW,smbus-beep", 334 .compatible = "SUNW,smbus-beep",
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 692a79ec2a22..5071af2c0604 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -87,7 +87,7 @@ static int __devexit sparc_i8042_remove(struct of_device *op)
87 return 0; 87 return 0;
88} 88}
89 89
90static struct of_device_id sparc_i8042_match[] = { 90static const struct of_device_id sparc_i8042_match[] = {
91 { 91 {
92 .name = "8042", 92 .name = "8042",
93 }, 93 },
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index e931f1df0af1..fd7a1017399a 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -138,7 +138,7 @@ static int __devexit uflash_remove(struct of_device *op)
138 return 0; 138 return 0;
139} 139}
140 140
141static struct of_device_id uflash_match[] = { 141static const struct of_device_id uflash_match[] = {
142 { 142 {
143 .name = UFLASH_OBPNAME, 143 .name = UFLASH_OBPNAME,
144 }, 144 },
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 03867b10f37e..979d778b133b 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1125,7 +1125,7 @@ static int __devexit myri_sbus_remove(struct of_device *op)
1125 return 0; 1125 return 0;
1126} 1126}
1127 1127
1128static struct of_device_id myri_sbus_match[] = { 1128static const struct of_device_id myri_sbus_match[] = {
1129 { 1129 {
1130 .name = "MYRICOM,mlanai", 1130 .name = "MYRICOM,mlanai",
1131 }, 1131 },
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index e4765b713aba..016d9e08692d 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9074,7 +9074,7 @@ static int __devexit niu_of_remove(struct of_device *op)
9074 return 0; 9074 return 0;
9075} 9075}
9076 9076
9077static struct of_device_id niu_match[] = { 9077static const struct of_device_id niu_match[] = {
9078 { 9078 {
9079 .name = "network", 9079 .name = "network",
9080 .compatible = "SUNW,niusl", 9080 .compatible = "SUNW,niusl",
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 7009a5e36c97..3f342b35a77f 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1281,7 +1281,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *op)
1281 return 0; 1281 return 0;
1282} 1282}
1283 1283
1284static struct of_device_id bigmac_sbus_match[] = { 1284static const struct of_device_id bigmac_sbus_match[] = {
1285 { 1285 {
1286 .name = "be", 1286 .name = "be",
1287 }, 1287 },
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index dc46e97ac122..f1ebeb5f65b2 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3252,7 +3252,7 @@ static int __devexit hme_sbus_remove(struct of_device *op)
3252 return 0; 3252 return 0;
3253} 3253}
3254 3254
3255static struct of_device_id hme_sbus_match[] = { 3255static const struct of_device_id hme_sbus_match[] = {
3256 { 3256 {
3257 .name = "SUNW,hme", 3257 .name = "SUNW,hme",
3258 }, 3258 },
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 292feb2154b4..30cdb81853b4 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1571,7 +1571,7 @@ static int __devexit sunlance_sbus_remove(struct of_device *op)
1571 return 0; 1571 return 0;
1572} 1572}
1573 1573
1574static struct of_device_id sunlance_sbus_match[] = { 1574static const struct of_device_id sunlance_sbus_match[] = {
1575 { 1575 {
1576 .name = "le", 1576 .name = "le",
1577 }, 1577 },
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 81604cac8e3e..f63644744ff9 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -965,7 +965,7 @@ static int __devexit qec_sbus_remove(struct of_device *op)
965 return 0; 965 return 0;
966} 966}
967 967
968static struct of_device_id qec_sbus_match[] = { 968static const struct of_device_id qec_sbus_match[] = {
969 { 969 {
970 .name = "qe", 970 .name = "qe",
971 }, 971 },
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index e4f00c6dfe09..065f229580d5 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -372,7 +372,7 @@ static int __devexit bpp_remove(struct of_device *op)
372 return 0; 372 return 0;
373} 373}
374 374
375static struct of_device_id bpp_match[] = { 375static const struct of_device_id bpp_match[] = {
376 { 376 {
377 .name = "SUNW,bpp", 377 .name = "SUNW,bpp",
378 }, 378 },
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index af7f4af6c5fb..f08e169ba1b5 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -404,7 +404,7 @@ static int __devexit bbc_i2c_remove(struct of_device *op)
404 return 0; 404 return 0;
405} 405}
406 406
407static struct of_device_id bbc_i2c_match[] = { 407static const struct of_device_id bbc_i2c_match[] = {
408 { 408 {
409 .name = "i2c", 409 .name = "i2c",
410 .compatible = "SUNW,bbc-i2c", 410 .compatible = "SUNW,bbc-i2c",
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2f16d78e92d7..2550af4ae432 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -256,7 +256,7 @@ static int __devexit d7s_remove(struct of_device *op)
256 return 0; 256 return 0;
257} 257}
258 258
259static struct of_device_id d7s_match[] = { 259static const struct of_device_id d7s_match[] = {
260 { 260 {
261 .name = "display7seg", 261 .name = "display7seg",
262 }, 262 },
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index ea8c35cbffd3..58e583b61e60 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1120,7 +1120,7 @@ static int __devexit envctrl_remove(struct of_device *op)
1120 return 0; 1120 return 0;
1121} 1121}
1122 1122
1123static struct of_device_id envctrl_match[] = { 1123static const struct of_device_id envctrl_match[] = {
1124 { 1124 {
1125 .name = "i2c", 1125 .name = "i2c",
1126 .compatible = "i2cpcf,8584", 1126 .compatible = "i2cpcf,8584",
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 715996f5c538..41083472ff4f 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -199,7 +199,7 @@ static int __devexit flash_remove(struct of_device *op)
199 return 0; 199 return 0;
200} 200}
201 201
202static struct of_device_id flash_match[] = { 202static const struct of_device_id flash_match[] = {
203 { 203 {
204 .name = "flashprom", 204 .name = "flashprom",
205 }, 205 },
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 6cff9777bbc0..27993c37775d 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -417,7 +417,7 @@ static int __devexit uctrl_remove(struct of_device *op)
417 return 0; 417 return 0;
418} 418}
419 419
420static struct of_device_id uctrl_match[] = { 420static const struct of_device_id uctrl_match[] = {
421 { 421 {
422 .name = "uctrl", 422 .name = "uctrl",
423 }, 423 },
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index b6ce82d3de3d..42807671512b 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1415,7 +1415,7 @@ static int __devexit qpti_sbus_remove(struct of_device *op)
1415 return 0; 1415 return 0;
1416} 1416}
1417 1417
1418static struct of_device_id qpti_match[] = { 1418static const struct of_device_id qpti_match[] = {
1419 { 1419 {
1420 .name = "ptisp", 1420 .name = "ptisp",
1421 .data = &qpti_template, 1421 .data = &qpti_template,
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 97316ca28a7a..3d73aad4bc82 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -617,7 +617,7 @@ static int __devexit esp_sbus_remove(struct of_device *op)
617 return 0; 617 return 0;
618} 618}
619 619
620static struct of_device_id esp_match[] = { 620static const struct of_device_id esp_match[] = {
621 { 621 {
622 .name = "SUNW,esp", 622 .name = "SUNW,esp",
623 }, 623 },
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index e41766d08035..a94a2ab4b571 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -616,7 +616,7 @@ static int __devexit hv_remove(struct of_device *dev)
616 return 0; 616 return 0;
617} 617}
618 618
619static struct of_device_id hv_match[] = { 619static const struct of_device_id hv_match[] = {
620 { 620 {
621 .name = "console", 621 .name = "console",
622 .compatible = "qcn", 622 .compatible = "qcn",
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 29b4458abf74..0355efe115d9 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -1078,7 +1078,7 @@ static int __devexit sab_remove(struct of_device *op)
1078 return 0; 1078 return 0;
1079} 1079}
1080 1080
1081static struct of_device_id sab_match[] = { 1081static const struct of_device_id sab_match[] = {
1082 { 1082 {
1083 .name = "se", 1083 .name = "se",
1084 }, 1084 },
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index a378464f9292..a4dc79b1d7ab 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1506,7 +1506,7 @@ static int __devexit su_remove(struct of_device *op)
1506 return 0; 1506 return 0;
1507} 1507}
1508 1508
1509static struct of_device_id su_match[] = { 1509static const struct of_device_id su_match[] = {
1510 { 1510 {
1511 .name = "su", 1511 .name = "su",
1512 }, 1512 },
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 3cb4c8aee13f..45a299f35617 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1480,7 +1480,7 @@ static int __devexit zs_remove(struct of_device *op)
1480 return 0; 1480 return 0;
1481} 1481}
1482 1482
1483static struct of_device_id zs_match[] = { 1483static const struct of_device_id zs_match[] = {
1484 { 1484 {
1485 .name = "zs", 1485 .name = "zs",
1486 }, 1486 },
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index e721644bad74..1e35ba6f18e0 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -372,7 +372,7 @@ static int __devexit bw2_remove(struct of_device *op)
372 return 0; 372 return 0;
373} 373}
374 374
375static struct of_device_id bw2_match[] = { 375static const struct of_device_id bw2_match[] = {
376 { 376 {
377 .name = "bwtwo", 377 .name = "bwtwo",
378 }, 378 },
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index b17e74671779..a2d1882791a5 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -589,7 +589,7 @@ static int __devexit cg14_remove(struct of_device *op)
589 return 0; 589 return 0;
590} 590}
591 591
592static struct of_device_id cg14_match[] = { 592static const struct of_device_id cg14_match[] = {
593 { 593 {
594 .name = "cgfourteen", 594 .name = "cgfourteen",
595 }, 595 },
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 3aa7b6cb0268..99f87fb61d05 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -456,7 +456,7 @@ static int __devexit cg3_remove(struct of_device *op)
456 return 0; 456 return 0;
457} 457}
458 458
459static struct of_device_id cg3_match[] = { 459static const struct of_device_id cg3_match[] = {
460 { 460 {
461 .name = "cgthree", 461 .name = "cgthree",
462 }, 462 },
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 2f64bb3bd254..9eaa63ab08fa 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -814,7 +814,7 @@ static int __devexit cg6_remove(struct of_device *op)
814 return 0; 814 return 0;
815} 815}
816 816
817static struct of_device_id cg6_match[] = { 817static const struct of_device_id cg6_match[] = {
818 { 818 {
819 .name = "cgsix", 819 .name = "cgsix",
820 }, 820 },
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 7992b13ee68f..9dbb9646081f 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1042,7 +1042,7 @@ static int __devexit ffb_remove(struct of_device *op)
1042 return 0; 1042 return 0;
1043} 1043}
1044 1044
1045static struct of_device_id ffb_match[] = { 1045static const struct of_device_id ffb_match[] = {
1046 { 1046 {
1047 .name = "SUNW,ffb", 1047 .name = "SUNW,ffb",
1048 }, 1048 },
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 13fea61d6ae4..465459e5eae6 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -641,7 +641,7 @@ static int __devexit leo_remove(struct of_device *op)
641 return 0; 641 return 0;
642} 642}
643 643
644static struct of_device_id leo_match[] = { 644static const struct of_device_id leo_match[] = {
645 { 645 {
646 .name = "SUNW,leo", 646 .name = "SUNW,leo",
647 }, 647 },
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 9e903454ffc1..7000f2cd5854 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -349,7 +349,7 @@ static int __devexit p9100_remove(struct of_device *op)
349 return 0; 349 return 0;
350} 350}
351 351
352static struct of_device_id p9100_match[] = { 352static const struct of_device_id p9100_match[] = {
353 { 353 {
354 .name = "p9100", 354 .name = "p9100",
355 }, 355 },
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 2a03f78bbb0d..643afbfe8277 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -505,7 +505,7 @@ static int __devexit tcx_remove(struct of_device *op)
505 return 0; 505 return 0;
506} 506}
507 507
508static struct of_device_id tcx_match[] = { 508static const struct of_device_id tcx_match[] = {
509 { 509 {
510 .name = "SUNW,tcx", 510 .name = "SUNW,tcx",
511 }, 511 },
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 1f1ee2520f17..084dfe9cecfb 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -666,7 +666,7 @@ static int __devexit cpwd_remove(struct of_device *op)
666 return 0; 666 return 0;
667} 667}
668 668
669static struct of_device_id cpwd_match[] = { 669static const struct of_device_id cpwd_match[] = {
670 { 670 {
671 .name = "watchdog", 671 .name = "watchdog",
672 }, 672 },
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 04fd1bac2db5..09cb1833ea27 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -230,7 +230,7 @@ static int __devexit riowd_remove(struct of_device *op)
230 return 0; 230 return 0;
231} 231}
232 232
233static struct of_device_id riowd_match[] = { 233static const struct of_device_id riowd_match[] = {
234 { 234 {
235 .name = "pmc", 235 .name = "pmc",
236 }, 236 },
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 0f82c3f6cfdb..5af5503edadb 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1070,7 +1070,7 @@ out_err:
1070 return err; 1070 return err;
1071} 1071}
1072 1072
1073static struct of_device_id amd7930_match[] = { 1073static const struct of_device_id amd7930_match[] = {
1074 { 1074 {
1075 .name = "audio", 1075 .name = "audio",
1076 }, 1076 },
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index cdbfae96bd88..727438d276eb 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2094,7 +2094,7 @@ static int __devexit cs4231_remove(struct of_device *op)
2094 return 0; 2094 return 0;
2095} 2095}
2096 2096
2097static struct of_device_id cs4231_match[] = { 2097static const struct of_device_id cs4231_match[] = {
2098 { 2098 {
2099 .name = "SUNW,CS4231", 2099 .name = "SUNW,CS4231",
2100 }, 2100 },
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 446f985b76fb..2edb0ad3de7e 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2665,7 +2665,7 @@ static int __devexit dbri_remove(struct of_device *op)
2665 return 0; 2665 return 0;
2666} 2666}
2667 2667
2668static struct of_device_id dbri_match[] = { 2668static const struct of_device_id dbri_match[] = {
2669 { 2669 {
2670 .name = "SUNW,DBRIe", 2670 .name = "SUNW,DBRIe",
2671 }, 2671 },