aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/maplecontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/joystick/maplecontrol.c')
-rw-r--r--drivers/input/joystick/maplecontrol.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 77cfde571bd9..59c10ec5a2a1 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -78,7 +78,7 @@ static void dc_pad_close(struct input_dev *dev)
78} 78}
79 79
80/* allow the controller to be used */ 80/* allow the controller to be used */
81static int __devinit probe_maple_controller(struct device *dev) 81static int probe_maple_controller(struct device *dev)
82{ 82{
83 static const short btn_bit[32] = { 83 static const short btn_bit[32] = {
84 BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1, 84 BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
@@ -157,7 +157,7 @@ fail:
157 return error; 157 return error;
158} 158}
159 159
160static int __devexit remove_maple_controller(struct device *dev) 160static int remove_maple_controller(struct device *dev)
161{ 161{
162 struct maple_device *mdev = to_maple_dev(dev); 162 struct maple_device *mdev = to_maple_dev(dev);
163 struct dc_pad *pad = maple_get_drvdata(mdev); 163 struct dc_pad *pad = maple_get_drvdata(mdev);
@@ -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