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/keyboard/mcs_touchkey.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/mcs_touchkey.c')
| -rw-r--r-- | drivers/input/keyboard/mcs_touchkey.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c index af1aab324a4c..64a0ca4c92f3 100644 --- a/drivers/input/keyboard/mcs_touchkey.c +++ b/drivers/input/keyboard/mcs_touchkey.c | |||
| @@ -274,18 +274,7 @@ static struct i2c_driver mcs_touchkey_driver = { | |||
| 274 | .id_table = mcs_touchkey_id, | 274 | .id_table = mcs_touchkey_id, |
| 275 | }; | 275 | }; |
| 276 | 276 | ||
| 277 | static int __init mcs_touchkey_init(void) | 277 | module_i2c_driver(mcs_touchkey_driver); |
| 278 | { | ||
| 279 | return i2c_add_driver(&mcs_touchkey_driver); | ||
| 280 | } | ||
| 281 | |||
| 282 | static void __exit mcs_touchkey_exit(void) | ||
| 283 | { | ||
| 284 | i2c_del_driver(&mcs_touchkey_driver); | ||
| 285 | } | ||
| 286 | |||
| 287 | module_init(mcs_touchkey_init); | ||
| 288 | module_exit(mcs_touchkey_exit); | ||
| 289 | 278 | ||
| 290 | /* Module information */ | 279 | /* Module information */ |
| 291 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); | 280 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); |