diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-12 20:08:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-12 20:08:27 -0800 |
| commit | 12870da5c3ace563902babdfa10d824fdbd4ce88 (patch) | |
| tree | 10ebbed2a6806f8bb6489c51514ee43f1b1adff8 /drivers | |
| parent | 71fe5ccac7ede00526de490a2df10ebcd39c4c11 (diff) | |
| parent | d6c4f2ac1de3c1ee10796740aa5b7a1e98a05f07 (diff) | |
| download | linux-stable-12870da5c3ace563902babdfa10d824fdbd4ce88.tar.gz linux-stable-12870da5c3ace563902babdfa10d824fdbd4ce88.tar.bz2 linux-stable-12870da5c3ace563902babdfa10d824fdbd4ce88.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/jz4740-hwmon.c | 4 |
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 = { |