summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:25:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 21:55:19 +0100
commitaa89ed9e369b345ef3737c56e7c8934af2df4aa6 (patch)
tree37754cd8b059fcbf78af2142115c33024a98405a
parentchar: remove use of __devinitdata (diff)
downloadlinux-aa89ed9e369b345ef3737c56e7c8934af2df4aa6.tar.xz
linux-aa89ed9e369b345ef3737c56e7c8934af2df4aa6.zip
char: remove use of __devinitconst
CONFIG_HOTPLUG is going away as an option so __devinitconst is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/char/mbcs.c2
-rw-r--r--drivers/char/xilinx_hwicap/xilinx_hwicap.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index f74e892711dd..e5d3e3f7a49b 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
return 0;
}
-static const struct cx_device_id __devinitconst mbcs_id_table[] = {
+static const struct cx_device_id mbcs_id_table[] = {
{
.part_num = MBCS_PART_NUM,
.mfg_num = MBCS_MFG_NUM,
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 547ed74e3d12..d10085f9a0de 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -785,7 +785,7 @@ static inline int hwicap_of_probe(struct platform_device *op,
}
#endif /* CONFIG_OF */
-static const struct of_device_id __devinitconst hwicap_of_match[];
+static const struct of_device_id hwicap_of_match[];
static int hwicap_drv_probe(struct platform_device *pdev)
{
const struct of_device_id *match;
@@ -829,7 +829,7 @@ static int __devexit hwicap_drv_remove(struct platform_device *pdev)
#ifdef CONFIG_OF
/* Match table for device tree binding */
-static const struct of_device_id __devinitconst hwicap_of_match[] = {
+static const struct of_device_id hwicap_of_match[] = {
{ .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config},
{ .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config},
{},