Browse Source

Merge tag 'hwmon-for-linus-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmin fixes from Guenter Roeck:
 "Fix module autoload for various drivers"

* tag 'hwmon-for-linus-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pwm-fan) Fix module autoload for OF platform driver
  hwmon: (gpio-fan) Fix module autoload for OF platform driver
  hwmon: (abx500) Fix module autoload for OF platform driver
Linus Torvalds 9 years ago
parent
commit
d4e842be2b
3 changed files with 3 additions and 0 deletions
  1. 1 0
      drivers/hwmon/abx500.c
  2. 1 0
      drivers/hwmon/gpio-fan.c
  3. 1 0
      drivers/hwmon/pwm-fan.c

+ 1 - 0
drivers/hwmon/abx500.c

@@ -470,6 +470,7 @@ static const struct of_device_id abx500_temp_match[] = {
 	{ .compatible = "stericsson,abx500-temp" },
 	{ .compatible = "stericsson,abx500-temp" },
 	{},
 	{},
 };
 };
+MODULE_DEVICE_TABLE(of, abx500_temp_match);
 #endif
 #endif
 
 
 static struct platform_driver abx500_temp_driver = {
 static struct platform_driver abx500_temp_driver = {

+ 1 - 0
drivers/hwmon/gpio-fan.c

@@ -539,6 +539,7 @@ static const struct of_device_id of_gpio_fan_match[] = {
 	{ .compatible = "gpio-fan", },
 	{ .compatible = "gpio-fan", },
 	{},
 	{},
 };
 };
+MODULE_DEVICE_TABLE(of, of_gpio_fan_match);
 #endif /* CONFIG_OF_GPIO */
 #endif /* CONFIG_OF_GPIO */
 
 
 static int gpio_fan_probe(struct platform_device *pdev)
 static int gpio_fan_probe(struct platform_device *pdev)

+ 1 - 0
drivers/hwmon/pwm-fan.c

@@ -323,6 +323,7 @@ static const struct of_device_id of_pwm_fan_match[] = {
 	{ .compatible = "pwm-fan", },
 	{ .compatible = "pwm-fan", },
 	{},
 	{},
 };
 };
+MODULE_DEVICE_TABLE(of, of_pwm_fan_match);
 
 
 static struct platform_driver pwm_fan_driver = {
 static struct platform_driver pwm_fan_driver = {
 	.probe		= pwm_fan_probe,
 	.probe		= pwm_fan_probe,