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/mcs5000_ts.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/mcs5000_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/mcs5000_ts.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index 2d84c80ceb66..b528511861ce 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c | |||
| @@ -302,18 +302,7 @@ static struct i2c_driver mcs5000_ts_driver = { | |||
| 302 | .id_table = mcs5000_ts_id, | 302 | .id_table = mcs5000_ts_id, |
| 303 | }; | 303 | }; |
| 304 | 304 | ||
| 305 | static int __init mcs5000_ts_init(void) | 305 | module_i2c_driver(mcs5000_ts_driver); |
| 306 | { | ||
| 307 | return i2c_add_driver(&mcs5000_ts_driver); | ||
| 308 | } | ||
| 309 | |||
| 310 | static void __exit mcs5000_ts_exit(void) | ||
| 311 | { | ||
| 312 | i2c_del_driver(&mcs5000_ts_driver); | ||
| 313 | } | ||
| 314 | |||
| 315 | module_init(mcs5000_ts_init); | ||
| 316 | module_exit(mcs5000_ts_exit); | ||
| 317 | 306 | ||
| 318 | /* Module information */ | 307 | /* Module information */ |
| 319 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); | 308 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); |