Commit d9244b5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Update documentation on fan_max
  hwmon: (lm78) Add missing __devexit_p()
parents 65039a31 d54d4624

Documentation/hwmon/sysfs-interface

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value 
		Unit: revolution/min (RPM)

		RW



fan[1-*]_max	Fan maximum value

		Unit: revolution/min (RPM)

		Only rarely supported by the hardware.

		RW



fan[1-*]_input	Fan input value.

		Unit: revolution/min (RPM)

		RO
@@ -390,6 +395,7 @@ OR 
in[0-*]_min_alarm

in[0-*]_max_alarm

fan[1-*]_min_alarm

fan[1-*]_max_alarm

temp[1-*]_min_alarm

temp[1-*]_max_alarm

temp[1-*]_crit_alarm

drivers/hwmon/lm78.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static struct platform_driver lm78_isa_driver = { 
		.name	= "lm78",

	},

	.probe		= lm78_isa_probe,

	.remove		= lm78_isa_remove,

	.remove		= __devexit_p(lm78_isa_remove),

};