summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 08:08:27 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 08:08:27 +0400
commit12870da5c3ace563902babdfa10d824fdbd4ce88 (patch)
tree10ebbed2a6806f8bb6489c51514ee43f1b1adff8
parent71fe5ccac7ede00526de490a2df10ebcd39c4c11 (diff)
parentd6c4f2ac1de3c1ee10796740aa5b7a1e98a05f07 (diff)
downloadlinux-12870da5c3ace563902babdfa10d824fdbd4ce88.tar.xz
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
-rw-r--r--drivers/hwmon/jz4740-hwmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index 7a48b1eb4233..5253d23361d9 100644
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -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 = {