diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 13:53:10 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 13:53:10 +0900 |
| commit | 18af30e259c25a64ad69bb749c661564bc886275 (patch) | |
| tree | 996c89594fd20f25fcc15b5843625d99473f6982 /drivers/input/misc/cma3000_d0x_i2c.c | |
| parent | 691c01c3f0b3252308162de90edcd02f7ca1733c (diff) | |
| parent | 6658a6991cef75719a21441aa0b7f8d6821534ee (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
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 d100cc5c578..fe9b85f0779 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 = { }, }; -static int __init cma3000_i2c_init(void) -{ - return i2c_add_driver(&cma3000_i2c_driver); -} - -static void __exit cma3000_i2c_exit(void) -{ - i2c_del_driver(&cma3000_i2c_driver); -} - -module_init(cma3000_i2c_init); -module_exit(cma3000_i2c_exit); +module_i2c_driver(cma3000_i2c_driver); MODULE_DESCRIPTION("CMA3000-D0x Accelerometer I2C Driver"); MODULE_LICENSE("GPL"); |