diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /drivers/i2c/i2c-smbus.c | |
| parent | 14d33d384693eb6083396199de516fdef320f7af (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'drivers/i2c/i2c-smbus.c')
| -rw-r--r-- | drivers/i2c/i2c-smbus.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index 9836d08f7a77..df3e0bf31eb3 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c | |||
| @@ -245,18 +245,7 @@ int i2c_handle_smbus_alert(struct i2c_client *ara) | |||
| 245 | } | 245 | } |
| 246 | EXPORT_SYMBOL_GPL(i2c_handle_smbus_alert); | 246 | EXPORT_SYMBOL_GPL(i2c_handle_smbus_alert); |
| 247 | 247 | ||
| 248 | static int __init i2c_smbus_init(void) | 248 | module_i2c_driver(smbalert_driver); |
| 249 | { | ||
| 250 | return i2c_add_driver(&smbalert_driver); | ||
| 251 | } | ||
| 252 | |||
| 253 | static void __exit i2c_smbus_exit(void) | ||
| 254 | { | ||
| 255 | i2c_del_driver(&smbalert_driver); | ||
| 256 | } | ||
| 257 | |||
| 258 | module_init(i2c_smbus_init); | ||
| 259 | module_exit(i2c_smbus_exit); | ||
| 260 | 249 | ||
| 261 | MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); | 250 | MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); |
| 262 | MODULE_DESCRIPTION("SMBus protocol extensions support"); | 251 | MODULE_DESCRIPTION("SMBus protocol extensions support"); |