diff options
Diffstat (limited to 'drivers/input/keyboard/w90p910_keypad.c')
-rw-r--r-- | drivers/input/keyboard/w90p910_keypad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index e0f6cd1ad0fd..ee163bee8cce 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c | |||
@@ -118,7 +118,7 @@ static void w90p910_keypad_close(struct input_dev *dev) | |||
118 | clk_disable(keypad->clk); | 118 | clk_disable(keypad->clk); |
119 | } | 119 | } |
120 | 120 | ||
121 | static int __devinit w90p910_keypad_probe(struct platform_device *pdev) | 121 | static int w90p910_keypad_probe(struct platform_device *pdev) |
122 | { | 122 | { |
123 | const struct w90p910_keypad_platform_data *pdata = | 123 | const struct w90p910_keypad_platform_data *pdata = |
124 | pdev->dev.platform_data; | 124 | pdev->dev.platform_data; |
@@ -234,7 +234,7 @@ failed_free: | |||
234 | return error; | 234 | return error; |
235 | } | 235 | } |
236 | 236 | ||
237 | static int __devexit w90p910_keypad_remove(struct platform_device *pdev) | 237 | static int w90p910_keypad_remove(struct platform_device *pdev) |
238 | { | 238 | { |
239 | struct w90p910_keypad *keypad = platform_get_drvdata(pdev); | 239 | struct w90p910_keypad *keypad = platform_get_drvdata(pdev); |
240 | struct resource *res; | 240 | struct resource *res; |
@@ -257,7 +257,7 @@ static int __devexit w90p910_keypad_remove(struct platform_device *pdev) | |||
257 | 257 | ||
258 | static struct platform_driver w90p910_keypad_driver = { | 258 | static struct platform_driver w90p910_keypad_driver = { |
259 | .probe = w90p910_keypad_probe, | 259 | .probe = w90p910_keypad_probe, |
260 | .remove = __devexit_p(w90p910_keypad_remove), | 260 | .remove = w90p910_keypad_remove, |
261 | .driver = { | 261 | .driver = { |
262 | .name = "nuc900-kpi", | 262 | .name = "nuc900-kpi", |
263 | .owner = THIS_MODULE, | 263 | .owner = THIS_MODULE, |