diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/hwmon/jz4740-hwmon.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/hwmon/jz4740-hwmon.c')
| -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 1c8b3d9e2051..fea292d43407 100644 --- a/drivers/hwmon/jz4740-hwmon.c +++ b/drivers/hwmon/jz4740-hwmon.c | |||
| @@ -32,7 +32,7 @@ struct jz4740_hwmon { | |||
| 32 | 32 | ||
| 33 | int irq; | 33 | int irq; |
| 34 | 34 | ||
| 35 | struct mfd_cell *cell; | 35 | const struct mfd_cell *cell; |
| 36 | struct device *hwmon; | 36 | struct device *hwmon; |
| 37 | 37 | ||
| 38 | struct completion read_completion; | 38 | struct completion read_completion; |
| @@ -112,7 +112,7 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev) | |||
| 112 | return -ENOMEM; | 112 | return -ENOMEM; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | hwmon->cell = pdev->dev.platform_data; | 115 | hwmon->cell = mfd_get_cell(pdev); |
| 116 | 116 | ||
| 117 | hwmon->irq = platform_get_irq(pdev, 0); | 117 | hwmon->irq = platform_get_irq(pdev, 0); |
| 118 | if (hwmon->irq < 0) { | 118 | if (hwmon->irq < 0) { |