aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:24:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:00:24 -0500
commit1d1313686422db3bffb2e7bd8eb2ccd9027d3783 (patch)
tree34814752a1b0fa7a5efedc98d375a6b49c78f602
parent2d991a164a61858012651e13c59521975504e260 (diff)
watchdog: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/watchdog/mixcomwd.c2
-rw-r--r--drivers/watchdog/of_xilinx_wdt.c2
-rw-r--r--drivers/watchdog/orion_wdt.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index 37e4b52dbce9..97d62ee50341 100644
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -73,7 +73,7 @@
73static struct { 73static struct {
74 int ioport; 74 int ioport;
75 int id; 75 int id;
76} mixcomwd_io_info[] __devinitdata = { 76} mixcomwd_io_info[] = {
77 /* The Mixcom cards */ 77 /* The Mixcom cards */
78 {0x0d90, MIXCOM_ID}, 78 {0x0d90, MIXCOM_ID},
79 {0x0e90, MIXCOM_ID}, 79 {0x0e90, MIXCOM_ID},
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index fd3e5f6ee55c..3ddc4e93906f 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -393,7 +393,7 @@ static int __devexit xwdt_remove(struct platform_device *dev)
393} 393}
394 394
395/* Match table for of_platform binding */ 395/* Match table for of_platform binding */
396static struct of_device_id __devinitdata xwdt_of_match[] = { 396static struct of_device_id xwdt_of_match[] = {
397 { .compatible = "xlnx,xps-timebase-wdt-1.01.a", }, 397 { .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
398 {}, 398 {},
399}; 399};
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index e6b7bd2117c6..f722635f3ecc 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -193,7 +193,7 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
193 orion_wdt_stop(&orion_wdt); 193 orion_wdt_stop(&orion_wdt);
194} 194}
195 195
196static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = { 196static const struct of_device_id orion_wdt_of_match_table[] = {
197 { .compatible = "marvell,orion-wdt", }, 197 { .compatible = "marvell,orion-wdt", },
198 {}, 198 {},
199}; 199};