aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-24 00:27:39 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 03:03:48 -0500
commit1cb0aa88179b7a71c240529e9d781d7bbb43d2e8 (patch)
tree9da5e91407baec88a7d1bb0364e8c98a9f9d316e /drivers/input/joystick
parent58b45d166f4c16d21f6aa059c6c5d87a9eeb1ff5 (diff)
Input: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/as5011.c2
-rw-r--r--drivers/input/joystick/maplecontrol.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 9d869e202b81..94f332773aec 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -366,7 +366,7 @@ static struct i2c_driver as5011_driver = {
366 .name = "as5011", 366 .name = "as5011",
367 }, 367 },
368 .probe = as5011_probe, 368 .probe = as5011_probe,
369 .remove = __devexit_p(as5011_remove), 369 .remove = as5011_remove,
370 .id_table = as5011_id, 370 .id_table = as5011_id,
371}; 371};
372 372
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 77cfde571bd9..c84345704258 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -175,7 +175,7 @@ static struct maple_driver dc_pad_driver = {
175 .drv = { 175 .drv = {
176 .name = "Dreamcast_controller", 176 .name = "Dreamcast_controller",
177 .probe = probe_maple_controller, 177 .probe = probe_maple_controller,
178 .remove = __devexit_p(remove_maple_controller), 178 .remove = remove_maple_controller,
179 }, 179 },
180}; 180};
181 181