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/qt1070.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/qt1070.c')
| -rw-r--r-- | drivers/input/keyboard/qt1070.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c index b21bf5b876bb..0b7b2f891752 100644 --- a/drivers/input/keyboard/qt1070.c +++ b/drivers/input/keyboard/qt1070.c | |||
| @@ -258,17 +258,7 @@ static struct i2c_driver qt1070_driver = { | |||
| 258 | .remove = __devexit_p(qt1070_remove), | 258 | .remove = __devexit_p(qt1070_remove), |
| 259 | }; | 259 | }; |
| 260 | 260 | ||
| 261 | static int __init qt1070_init(void) | 261 | module_i2c_driver(qt1070_driver); |
| 262 | { | ||
| 263 | return i2c_add_driver(&qt1070_driver); | ||
| 264 | } | ||
| 265 | module_init(qt1070_init); | ||
| 266 | |||
| 267 | static void __exit qt1070_exit(void) | ||
| 268 | { | ||
| 269 | i2c_del_driver(&qt1070_driver); | ||
| 270 | } | ||
| 271 | module_exit(qt1070_exit); | ||
| 272 | 262 | ||
| 273 | MODULE_AUTHOR("Bo Shen <voice.shen@atmel.com>"); | 263 | MODULE_AUTHOR("Bo Shen <voice.shen@atmel.com>"); |
| 274 | MODULE_DESCRIPTION("Driver for AT42QT1070 QTouch sensor"); | 264 | MODULE_DESCRIPTION("Driver for AT42QT1070 QTouch sensor"); |