diff options
Diffstat (limited to 'drivers/input/keyboard/tnetv107x-keypad.c')
-rw-r--r-- | drivers/input/keyboard/tnetv107x-keypad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c index 4c34f21fbe2..ee163501129 100644 --- a/drivers/input/keyboard/tnetv107x-keypad.c +++ b/drivers/input/keyboard/tnetv107x-keypad.c | |||
@@ -153,7 +153,7 @@ static void keypad_stop(struct input_dev *dev) | |||
153 | clk_disable(kp->clk); | 153 | clk_disable(kp->clk); |
154 | } | 154 | } |
155 | 155 | ||
156 | static int __devinit keypad_probe(struct platform_device *pdev) | 156 | static int keypad_probe(struct platform_device *pdev) |
157 | { | 157 | { |
158 | const struct matrix_keypad_platform_data *pdata; | 158 | const struct matrix_keypad_platform_data *pdata; |
159 | const struct matrix_keymap_data *keymap_data; | 159 | const struct matrix_keymap_data *keymap_data; |
@@ -301,7 +301,7 @@ error_res: | |||
301 | return error; | 301 | return error; |
302 | } | 302 | } |
303 | 303 | ||
304 | static int __devexit keypad_remove(struct platform_device *pdev) | 304 | static int keypad_remove(struct platform_device *pdev) |
305 | { | 305 | { |
306 | struct keypad_data *kp = platform_get_drvdata(pdev); | 306 | struct keypad_data *kp = platform_get_drvdata(pdev); |
307 | 307 | ||
@@ -319,7 +319,7 @@ static int __devexit keypad_remove(struct platform_device *pdev) | |||
319 | 319 | ||
320 | static struct platform_driver keypad_driver = { | 320 | static struct platform_driver keypad_driver = { |
321 | .probe = keypad_probe, | 321 | .probe = keypad_probe, |
322 | .remove = __devexit_p(keypad_remove), | 322 | .remove = keypad_remove, |
323 | .driver.name = "tnetv107x-keypad", | 323 | .driver.name = "tnetv107x-keypad", |
324 | .driver.owner = THIS_MODULE, | 324 | .driver.owner = THIS_MODULE, |
325 | }; | 325 | }; |