diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-03-28 12:44:26 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-03-28 12:44:26 -0400 |
| commit | 99bdc3880c611c7f2061fbd5372ef81b40217e26 (patch) | |
| tree | ef68a53e28e9ee53ce9db3642bab5fa5b3d44866 /drivers/misc | |
| parent | ed59992e8d91b70053c53d846a76f7e1ac000454 (diff) | |
| parent | b4e1b7e88b2c87c358c2a88bec0c76d25accc604 (diff) | |
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/bmp085.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c index 63ee4c1a5315..b6e1c9a6679e 100644 --- a/drivers/misc/bmp085.c +++ b/drivers/misc/bmp085.c | |||
| @@ -449,6 +449,7 @@ static const struct i2c_device_id bmp085_id[] = { | |||
| 449 | { "bmp085", 0 }, | 449 | { "bmp085", 0 }, |
| 450 | { } | 450 | { } |
| 451 | }; | 451 | }; |
| 452 | MODULE_DEVICE_TABLE(i2c, bmp085_id); | ||
| 452 | 453 | ||
| 453 | static struct i2c_driver bmp085_driver = { | 454 | static struct i2c_driver bmp085_driver = { |
| 454 | .driver = { | 455 | .driver = { |