Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12870da5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of... 

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (jz4740) Staticise jz4740_hwmon_driver
  hwmon: (jz4740) fix signedness bug
parents 71fe5cca d6c4f2ac

drivers/hwmon/jz4740-hwmon.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static ssize_t jz4740_hwmon_read_adcin(struct device *dev, 
{

	struct jz4740_hwmon *hwmon = dev_get_drvdata(dev);

	struct completion *completion = &hwmon->read_completion;

	unsigned long t;

	long t;

	unsigned long val;

	int ret;
@@ -203,7 +203,7 @@ static int __devexit jz4740_hwmon_remove(struct platform_device *pdev) 
	return 0;

}



struct platform_driver jz4740_hwmon_driver = {

static struct platform_driver jz4740_hwmon_driver = {

	.probe	= jz4740_hwmon_probe,

	.remove = __devexit_p(jz4740_hwmon_remove),

	.driver = {