Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
index 71835412529f..3f3f9a47acfd 100644
--- a/drivers/hwmon/s3c-hwmon.c
+++ b/drivers/hwmon/s3c-hwmon.c
@@ -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;
                 }