diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:24:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 12:00:24 -0800 |
| commit | 1d1313686422db3bffb2e7bd8eb2ccd9027d3783 (patch) | |
| tree | 34814752a1b0fa7a5efedc98d375a6b49c78f602 /drivers | |
| parent | 2d991a164a61858012651e13c59521975504e260 (diff) | |
| download | blackbird-op-linux-1d1313686422db3bffb2e7bd8eb2ccd9027d3783.tar.gz blackbird-op-linux-1d1313686422db3bffb2e7bd8eb2ccd9027d3783.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/mixcomwd.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/of_xilinx_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/orion_wdt.c | 2 |
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 @@ 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/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) } /* 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/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) 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", }, {}, }; |
