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/joystick/as5011.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/as5011.c')
| -rw-r--r-- | drivers/input/joystick/as5011.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c index 6d6e7418dc21..3063464474bf 100644 --- a/drivers/input/joystick/as5011.c +++ b/drivers/input/joystick/as5011.c | |||
| @@ -355,14 +355,4 @@ static struct i2c_driver as5011_driver = { | |||
| 355 | .id_table = as5011_id, | 355 | .id_table = as5011_id, |
| 356 | }; | 356 | }; |
| 357 | 357 | ||
| 358 | static int __init as5011_init(void) | 358 | module_i2c_driver(as5011_driver); |
| 359 | { | ||
| 360 | return i2c_add_driver(&as5011_driver); | ||
| 361 | } | ||
| 362 | module_init(as5011_init); | ||
| 363 | |||
| 364 | static void __exit as5011_exit(void) | ||
| 365 | { | ||
| 366 | i2c_del_driver(&as5011_driver); | ||
| 367 | } | ||
| 368 | module_exit(as5011_exit); | ||