diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 01:04:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 01:04:14 -0500 |
| commit | 022573c275500e1a50889949f679d04b5446edf6 (patch) | |
| tree | 766ab0e13fc38275466f8544d1bbf4982833cbff /drivers/input/serio/ct82c710.c | |
| parent | 516d798f656614f59553b1ff3592c2c36102b684 (diff) | |
| parent | a455e2985f57e2a71566bb8850094af38b2c932d (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.8 merge window.
Diffstat (limited to 'drivers/input/serio/ct82c710.c')
| -rw-r--r-- | drivers/input/serio/ct82c710.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c index 852816567241..cfe549d4eaa5 100644 --- a/drivers/input/serio/ct82c710.c +++ b/drivers/input/serio/ct82c710.c | |||
| @@ -175,7 +175,7 @@ static int __init ct82c710_detect(void) | |||
| 175 | return 0; | 175 | return 0; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static int __devinit ct82c710_probe(struct platform_device *dev) | 178 | static int ct82c710_probe(struct platform_device *dev) |
| 179 | { | 179 | { |
| 180 | ct82c710_port = kzalloc(sizeof(struct serio), GFP_KERNEL); | 180 | ct82c710_port = kzalloc(sizeof(struct serio), GFP_KERNEL); |
| 181 | if (!ct82c710_port) | 181 | if (!ct82c710_port) |
| @@ -199,7 +199,7 @@ static int __devinit ct82c710_probe(struct platform_device *dev) | |||
| 199 | return 0; | 199 | return 0; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | static int __devexit ct82c710_remove(struct platform_device *dev) | 202 | static int ct82c710_remove(struct platform_device *dev) |
| 203 | { | 203 | { |
| 204 | serio_unregister_port(ct82c710_port); | 204 | serio_unregister_port(ct82c710_port); |
| 205 | 205 | ||
| @@ -212,7 +212,7 @@ static struct platform_driver ct82c710_driver = { | |||
| 212 | .owner = THIS_MODULE, | 212 | .owner = THIS_MODULE, |
| 213 | }, | 213 | }, |
| 214 | .probe = ct82c710_probe, | 214 | .probe = ct82c710_probe, |
| 215 | .remove = __devexit_p(ct82c710_remove), | 215 | .remove = ct82c710_remove, |
| 216 | }; | 216 | }; |
| 217 | 217 | ||
| 218 | 218 | ||