diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-24 00:31:00 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 03:04:08 -0500 |
commit | 78f50c246f4286d40a1f42fecc779d47e40503a2 (patch) | |
tree | afd39f280406671201b259f7bc6143d6ca1e26f8 | |
parent | d6f6dfd941de2b106af1290b810eff9b1c523772 (diff) |
Input: 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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/keyboard/locomokbd.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/mpr121_touchkey.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/st1232.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c index 5f66272c2d7c..dba900c54ce6 100644 --- a/drivers/input/keyboard/locomokbd.c +++ b/drivers/input/keyboard/locomokbd.c | |||
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL"); | |||
46 | #define KEY_CENTER KEY_F15 | 46 | #define KEY_CENTER KEY_F15 |
47 | 47 | ||
48 | static const unsigned char | 48 | static const unsigned char |
49 | locomokbd_keycode[LOCOMOKBD_NUMKEYS] __devinitconst = { | 49 | locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { |
50 | 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ | 50 | 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ |
51 | 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ | 51 | 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ |
52 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ | 52 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ |
diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c index 63b20d029454..38b1c0f72ed3 100644 --- a/drivers/input/keyboard/mpr121_touchkey.c +++ b/drivers/input/keyboard/mpr121_touchkey.c | |||
@@ -71,7 +71,7 @@ struct mpr121_init_register { | |||
71 | u8 val; | 71 | u8 val; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static const struct mpr121_init_register init_reg_table[] __devinitconst = { | 74 | static const struct mpr121_init_register init_reg_table[] = { |
75 | { MHD_RISING_ADDR, 0x1 }, | 75 | { MHD_RISING_ADDR, 0x1 }, |
76 | { NHD_RISING_ADDR, 0x1 }, | 76 | { NHD_RISING_ADDR, 0x1 }, |
77 | { MHD_FALLING_ADDR, 0x1 }, | 77 | { MHD_FALLING_ADDR, 0x1 }, |
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 73f90dd8eee6..f929d8f2dc50 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
@@ -355,7 +355,7 @@ static int __devexit xps2_of_remove(struct platform_device *of_dev) | |||
355 | } | 355 | } |
356 | 356 | ||
357 | /* Match table for of_platform binding */ | 357 | /* Match table for of_platform binding */ |
358 | static const struct of_device_id xps2_of_match[] __devinitconst = { | 358 | static const struct of_device_id xps2_of_match[] = { |
359 | { .compatible = "xlnx,xps-ps2-1.00.a", }, | 359 | { .compatible = "xlnx,xps-ps2-1.00.a", }, |
360 | { /* end of list */ }, | 360 | { /* end of list */ }, |
361 | }; | 361 | }; |
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index 62a4b5d71643..5fa0ca346478 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c | |||
@@ -255,7 +255,7 @@ static const struct i2c_device_id st1232_ts_id[] = { | |||
255 | MODULE_DEVICE_TABLE(i2c, st1232_ts_id); | 255 | MODULE_DEVICE_TABLE(i2c, st1232_ts_id); |
256 | 256 | ||
257 | #ifdef CONFIG_OF | 257 | #ifdef CONFIG_OF |
258 | static const struct of_device_id st1232_ts_dt_ids[] __devinitconst = { | 258 | static const struct of_device_id st1232_ts_dt_ids[] = { |
259 | { .compatible = "sitronix,st1232", }, | 259 | { .compatible = "sitronix,st1232", }, |
260 | { } | 260 | { } |
261 | }; | 261 | }; |