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/atmel_mxt_ts.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/atmel_mxt_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index a596c2775d1a..19d4ea65ea01 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | |||
| @@ -1267,18 +1267,7 @@ static struct i2c_driver mxt_driver = { | |||
| 1267 | .id_table = mxt_id, | 1267 | .id_table = mxt_id, |
| 1268 | }; | 1268 | }; |
| 1269 | 1269 | ||
| 1270 | static int __init mxt_init(void) | 1270 | module_i2c_driver(mxt_driver); |
| 1271 | { | ||
| 1272 | return i2c_add_driver(&mxt_driver); | ||
| 1273 | } | ||
| 1274 | |||
| 1275 | static void __exit mxt_exit(void) | ||
| 1276 | { | ||
| 1277 | i2c_del_driver(&mxt_driver); | ||
| 1278 | } | ||
| 1279 | |||
| 1280 | module_init(mxt_init); | ||
| 1281 | module_exit(mxt_exit); | ||
| 1282 | 1271 | ||
| 1283 | /* Module information */ | 1272 | /* Module information */ |
| 1284 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); | 1273 | MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); |