aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 11:32:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 11:32:56 -0400
commit7dbb25a579fe1f068358a19928ada4f9be62e60d (patch)
tree29730185284cbe3ac6252847e15df35118958737
parent4352d9d44b935e4d000be6ec89ddb55c2bf35f24 (diff)
parentc4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e (diff)
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: twl4030-madc-hwmon: add "platform:" prefix for platform modalias
-rw-r--r--drivers/hwmon/twl4030-madc-hwmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c
index 97e22bef85ab..de5819199e2e 100644
--- a/drivers/hwmon/twl4030-madc-hwmon.c
+++ b/drivers/hwmon/twl4030-madc-hwmon.c
@@ -154,4 +154,4 @@ module_exit(twl4030_madc_hwmon_exit);
154MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver"); 154MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver");
155MODULE_LICENSE("GPL"); 155MODULE_LICENSE("GPL");
156MODULE_AUTHOR("J Keerthy"); 156MODULE_AUTHOR("J Keerthy");
157MODULE_ALIAS("twl4030_madc_hwmon"); 157MODULE_ALIAS("platform:twl4030_madc_hwmon");