diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /drivers/input/touchscreen/tsc2007.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/tsc2007.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 1f674cb6c55b..1473d2382afd 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
| @@ -399,18 +399,7 @@ static struct i2c_driver tsc2007_driver = { | |||
| 399 | .remove = __devexit_p(tsc2007_remove), | 399 | .remove = __devexit_p(tsc2007_remove), |
| 400 | }; | 400 | }; |
| 401 | 401 | ||
| 402 | static int __init tsc2007_init(void) | 402 | module_i2c_driver(tsc2007_driver); |
| 403 | { | ||
| 404 | return i2c_add_driver(&tsc2007_driver); | ||
| 405 | } | ||
| 406 | |||
| 407 | static void __exit tsc2007_exit(void) | ||
| 408 | { | ||
| 409 | i2c_del_driver(&tsc2007_driver); | ||
| 410 | } | ||
| 411 | |||
| 412 | module_init(tsc2007_init); | ||
| 413 | module_exit(tsc2007_exit); | ||
| 414 | 403 | ||
| 415 | MODULE_AUTHOR("Kwangwoo Lee <kwlee@mtekvision.com>"); | 404 | MODULE_AUTHOR("Kwangwoo Lee <kwlee@mtekvision.com>"); |
| 416 | MODULE_DESCRIPTION("TSC2007 TouchScreen Driver"); | 405 | MODULE_DESCRIPTION("TSC2007 TouchScreen Driver"); |