diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:32:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:32:56 -0700 |
| commit | 7dbb25a579fe1f068358a19928ada4f9be62e60d (patch) | |
| tree | 29730185284cbe3ac6252847e15df35118958737 | |
| parent | ntp: fix non privileged system time shifting (diff) | |
| parent | hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modalias (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.c | 2 |
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); MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("J Keerthy"); -MODULE_ALIAS("twl4030_madc_hwmon"); +MODULE_ALIAS("platform:twl4030_madc_hwmon"); |