From fb5b3c57416795be18b9f9476367f7a2098b7eb3 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:24:05 -0500
Subject: [PATCH] --- yaml --- r: 336890 b: refs/heads/master c:
 1d1313686422db3bffb2e7bd8eb2ccd9027d3783 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/watchdog/mixcomwd.c      | 2 +-
 trunk/drivers/watchdog/of_xilinx_wdt.c | 2 +-
 trunk/drivers/watchdog/orion_wdt.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 66316da17c15..d2e01b004c86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d991a164a61858012651e13c59521975504e260
+refs/heads/master: 1d1313686422db3bffb2e7bd8eb2ccd9027d3783
diff --git a/trunk/drivers/watchdog/mixcomwd.c b/trunk/drivers/watchdog/mixcomwd.c
index 37e4b52dbce9..97d62ee50341 100644
--- a/trunk/drivers/watchdog/mixcomwd.c
+++ b/trunk/drivers/watchdog/mixcomwd.c
@@ -73,7 +73,7 @@
 static struct {
 	int ioport;
 	int id;
-} mixcomwd_io_info[] __devinitdata = {
+} mixcomwd_io_info[] = {
 	/* The Mixcom cards */
 	{0x0d90, MIXCOM_ID},
 	{0x0e90, MIXCOM_ID},
diff --git a/trunk/drivers/watchdog/of_xilinx_wdt.c b/trunk/drivers/watchdog/of_xilinx_wdt.c
index fd3e5f6ee55c..3ddc4e93906f 100644
--- a/trunk/drivers/watchdog/of_xilinx_wdt.c
+++ b/trunk/drivers/watchdog/of_xilinx_wdt.c
@@ -393,7 +393,7 @@ static int __devexit xwdt_remove(struct platform_device *dev)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id __devinitdata xwdt_of_match[] = {
+static struct of_device_id xwdt_of_match[] = {
 	{ .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
 	{},
 };
diff --git a/trunk/drivers/watchdog/orion_wdt.c b/trunk/drivers/watchdog/orion_wdt.c
index e6b7bd2117c6..f722635f3ecc 100644
--- a/trunk/drivers/watchdog/orion_wdt.c
+++ b/trunk/drivers/watchdog/orion_wdt.c
@@ -193,7 +193,7 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
 	orion_wdt_stop(&orion_wdt);
 }
 
-static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = {
+static const struct of_device_id orion_wdt_of_match_table[] = {
 	{ .compatible = "marvell,orion-wdt", },
 	{},
 };