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/misc/gp2ap002a00f.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/gp2ap002a00f.c')
| -rw-r--r-- | drivers/input/misc/gp2ap002a00f.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/misc/gp2ap002a00f.c b/drivers/input/misc/gp2ap002a00f.c index 71fba8c2fc66..b6664cfa340a 100644 --- a/drivers/input/misc/gp2ap002a00f.c +++ b/drivers/input/misc/gp2ap002a00f.c | |||
| @@ -281,18 +281,7 @@ static struct i2c_driver gp2a_i2c_driver = { | |||
| 281 | .id_table = gp2a_i2c_id, | 281 | .id_table = gp2a_i2c_id, |
| 282 | }; | 282 | }; |
| 283 | 283 | ||
| 284 | static int __init gp2a_init(void) | 284 | module_i2c_driver(gp2a_i2c_driver); |
| 285 | { | ||
| 286 | return i2c_add_driver(&gp2a_i2c_driver); | ||
| 287 | } | ||
| 288 | |||
| 289 | static void __exit gp2a_exit(void) | ||
| 290 | { | ||
| 291 | i2c_del_driver(&gp2a_i2c_driver); | ||
| 292 | } | ||
| 293 | |||
| 294 | module_init(gp2a_init); | ||
| 295 | module_exit(gp2a_exit); | ||
| 296 | 285 | ||
| 297 | MODULE_AUTHOR("Courtney Cavin <courtney.cavin@sonyericsson.com>"); | 286 | MODULE_AUTHOR("Courtney Cavin <courtney.cavin@sonyericsson.com>"); |
| 298 | MODULE_DESCRIPTION("Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"); | 287 | MODULE_DESCRIPTION("Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"); |