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/max11801_ts.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/max11801_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/max11801_ts.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/max11801_ts.c b/drivers/input/touchscreen/max11801_ts.c index 4627fe55b401..4eab50b856d7 100644 --- a/drivers/input/touchscreen/max11801_ts.c +++ b/drivers/input/touchscreen/max11801_ts.c | |||
| @@ -255,18 +255,7 @@ static struct i2c_driver max11801_ts_driver = { | |||
| 255 | .remove = __devexit_p(max11801_ts_remove), | 255 | .remove = __devexit_p(max11801_ts_remove), |
| 256 | }; | 256 | }; |
| 257 | 257 | ||
| 258 | static int __init max11801_ts_init(void) | 258 | module_i2c_driver(max11801_ts_driver); |
| 259 | { | ||
| 260 | return i2c_add_driver(&max11801_ts_driver); | ||
| 261 | } | ||
| 262 | |||
| 263 | static void __exit max11801_ts_exit(void) | ||
| 264 | { | ||
| 265 | i2c_del_driver(&max11801_ts_driver); | ||
| 266 | } | ||
| 267 | |||
| 268 | module_init(max11801_ts_init); | ||
| 269 | module_exit(max11801_ts_exit); | ||
| 270 | 259 | ||
| 271 | MODULE_AUTHOR("Zhang Jiejing <jiejing.zhang@freescale.com>"); | 260 | MODULE_AUTHOR("Zhang Jiejing <jiejing.zhang@freescale.com>"); |
| 272 | MODULE_DESCRIPTION("Touchscreen driver for MAXI MAX11801 controller"); | 261 | MODULE_DESCRIPTION("Touchscreen driver for MAXI MAX11801 controller"); |