]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
hwmon: (s3c-hwmon) Fix build error
authorBen Dooks <ben-linux@fluff.org>
Wed, 9 Dec 2009 19:35:45 +0000 (20:35 +0100)
committerJean Delvare <khali@linux-fr.org>
Wed, 9 Dec 2009 19:35:45 +0000 (20:35 +0100)
The previous patch, commit be4c23c93c4828d36ac9e1a88410618a61676426 was
from the wrong tree and thus broke the current build which had the
channel configuration name changed.

Fix the following build errors:

drivers/hwmon/s3c-hwmon.c: In function 's3c_hwmon_probe':
drivers/hwmon/s3c-hwmon.c:326: warning: initialization from incompatible pointer type
drivers/hwmon/s3c-hwmon.c:331: error: dereferencing pointer to incomplete type
drivers/hwmon/s3c-hwmon.c:336: error: dereferencing pointer to incomplete type

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/hwmon/s3c-hwmon.c

index 71835412529fca92dd4964dc28c95c6c749162be..3f3f9a47acfd92fa473a000f43552047a7e962de 100644 (file)
@@ -323,7 +323,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
        }
 
        for (i = 0; i < ARRAY_SIZE(pdata->in); i++) {
-               struct s3c24xx_adc_hwmon_incfg *cfg = pdata->in[i];
+               struct s3c_hwmon_chcfg *cfg = pdata->in[i];
 
                if (!cfg)
                        continue;
@@ -333,7 +333,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
                                 "channel %d multiplier too large\n",
                                 i);
 
-               if (cfg->divider == 0) {
+               if (cfg->div == 0) {
                        dev_err(&dev->dev, "channel %d divider zero\n", i);
                        continue;
                }