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/cma3000_d0x_i2c.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/cma3000_d0x_i2c.c')
| -rw-r--r-- | drivers/input/misc/cma3000_d0x_i2c.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/misc/cma3000_d0x_i2c.c b/drivers/input/misc/cma3000_d0x_i2c.c index d100cc5c5783..fe9b85f07792 100644 --- a/drivers/input/misc/cma3000_d0x_i2c.c +++ b/drivers/input/misc/cma3000_d0x_i2c.c | |||
| @@ -125,18 +125,7 @@ static struct i2c_driver cma3000_i2c_driver = { | |||
| 125 | }, | 125 | }, |
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | static int __init cma3000_i2c_init(void) | 128 | module_i2c_driver(cma3000_i2c_driver); |
| 129 | { | ||
| 130 | return i2c_add_driver(&cma3000_i2c_driver); | ||
| 131 | } | ||
| 132 | |||
| 133 | static void __exit cma3000_i2c_exit(void) | ||
| 134 | { | ||
| 135 | i2c_del_driver(&cma3000_i2c_driver); | ||
| 136 | } | ||
| 137 | |||
| 138 | module_init(cma3000_i2c_init); | ||
| 139 | module_exit(cma3000_i2c_exit); | ||
| 140 | 129 | ||
| 141 | MODULE_DESCRIPTION("CMA3000-D0x Accelerometer I2C Driver"); | 130 | MODULE_DESCRIPTION("CMA3000-D0x Accelerometer I2C Driver"); |
| 142 | MODULE_LICENSE("GPL"); | 131 | MODULE_LICENSE("GPL"); |