aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/hw_random/pasemi-rng.c2
-rw-r--r--drivers/char/hw_random/powernv-rng.c2
-rw-r--r--drivers/char/hw_random/ppc4xx-rng.c2
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c4
-rw-r--r--drivers/char/xillybus/xillybus_of.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index 3eb7bdd7f93b..51cb1d5cc489 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -133,7 +133,7 @@ static int rng_remove(struct platform_device *dev)
133 return 0; 133 return 0;
134} 134}
135 135
136static struct of_device_id rng_match[] = { 136static const struct of_device_id rng_match[] = {
137 { .compatible = "1682m-rng", }, 137 { .compatible = "1682m-rng", },
138 { .compatible = "pasemi,pwrficient-rng", }, 138 { .compatible = "pasemi,pwrficient-rng", },
139 { }, 139 { },
diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/powernv-rng.c
index 3f4f63204560..263a5bb8e605 100644
--- a/drivers/char/hw_random/powernv-rng.c
+++ b/drivers/char/hw_random/powernv-rng.c
@@ -61,7 +61,7 @@ static int powernv_rng_probe(struct platform_device *pdev)
61 return 0; 61 return 0;
62} 62}
63 63
64static struct of_device_id powernv_rng_match[] = { 64static const struct of_device_id powernv_rng_match[] = {
65 { .compatible = "ibm,power-rng",}, 65 { .compatible = "ibm,power-rng",},
66 {}, 66 {},
67}; 67};
diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c
index c85d31a5f9e3..b2cfda0fa93e 100644
--- a/drivers/char/hw_random/ppc4xx-rng.c
+++ b/drivers/char/hw_random/ppc4xx-rng.c
@@ -123,7 +123,7 @@ static int ppc4xx_rng_remove(struct platform_device *dev)
123 return 0; 123 return 0;
124} 124}
125 125
126static struct of_device_id ppc4xx_rng_match[] = { 126static const struct of_device_id ppc4xx_rng_match[] = {
127 { .compatible = "ppc4xx-rng", }, 127 { .compatible = "ppc4xx-rng", },
128 { .compatible = "amcc,ppc460ex-rng", }, 128 { .compatible = "amcc,ppc460ex-rng", },
129 { .compatible = "amcc,ppc440epx-rng", }, 129 { .compatible = "amcc,ppc440epx-rng", },
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f6646ed3047e..e6a6da4ad2f7 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2664,7 +2664,7 @@ static struct pci_driver ipmi_pci_driver = {
2664}; 2664};
2665#endif /* CONFIG_PCI */ 2665#endif /* CONFIG_PCI */
2666 2666
2667static struct of_device_id ipmi_match[]; 2667static const struct of_device_id ipmi_match[];
2668static int ipmi_probe(struct platform_device *dev) 2668static int ipmi_probe(struct platform_device *dev)
2669{ 2669{
2670#ifdef CONFIG_OF 2670#ifdef CONFIG_OF
@@ -2761,7 +2761,7 @@ static int ipmi_remove(struct platform_device *dev)
2761 return 0; 2761 return 0;
2762} 2762}
2763 2763
2764static struct of_device_id ipmi_match[] = 2764static const struct of_device_id ipmi_match[] =
2765{ 2765{
2766 { .type = "ipmi", .compatible = "ipmi-kcs", 2766 { .type = "ipmi", .compatible = "ipmi-kcs",
2767 .data = (void *)(unsigned long) SI_KCS }, 2767 .data = (void *)(unsigned long) SI_KCS },
diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c
index 2002a3a28146..781865084dc1 100644
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c
@@ -31,7 +31,7 @@ MODULE_LICENSE("GPL v2");
31static const char xillyname[] = "xillybus_of"; 31static const char xillyname[] = "xillybus_of";
32 32
33/* Match table for of_platform binding */ 33/* Match table for of_platform binding */
34static struct of_device_id xillybus_of_match[] = { 34static const struct of_device_id xillybus_of_match[] = {
35 { .compatible = "xillybus,xillybus-1.00.a", }, 35 { .compatible = "xillybus,xillybus-1.00.a", },
36 { .compatible = "xlnx,xillybus-1.00.a", }, /* Deprecated */ 36 { .compatible = "xlnx,xillybus-1.00.a", }, /* Deprecated */
37 {} 37 {}