summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-28 18:09:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-28 18:09:02 -0800
commit3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1 (patch)
tree8a72df51c0ff3f7ac9e15b841e6a889c9202ba67
parente6eb5ce1b202ac9cdcfda5be559c9b9d8ec7542c (diff)
parenta7254d68b61c7873ce20591f0c56bf0245b72a76 (diff)
downloadop-kernel-dev-3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1.zip
op-kernel-dev-3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1.tar.gz
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (adt7411) add MODULE_DEVICE_TABLE hwmon: (ad7414) add MODULE_DEVICE_TABLE
-rw-r--r--drivers/hwmon/ad7414.c1
-rw-r--r--drivers/hwmon/adt7411.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index 86d822a..d46c0c7 100644
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -242,6 +242,7 @@ static const struct i2c_device_id ad7414_id[] = {
{ "ad7414", 0 },
{}
};
+MODULE_DEVICE_TABLE(i2c, ad7414_id);
static struct i2c_driver ad7414_driver = {
.driver = {
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c
index f13c843..5cc3e37 100644
--- a/drivers/hwmon/adt7411.c
+++ b/drivers/hwmon/adt7411.c
@@ -334,6 +334,7 @@ static const struct i2c_device_id adt7411_id[] = {
{ "adt7411", 0 },
{ }
};
+MODULE_DEVICE_TABLE(i2c, adt7411_id);
static struct i2c_driver adt7411_driver = {
.driver = {
OpenPOWER on IntegriCloud