diff options
author | Andres Salomon <dilinger@queued.net> | 2011-03-01 16:35:48 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:42:02 -0400 |
commit | e9300066bbd21c4fba3c8c5475c6a21d9c97694e (patch) | |
tree | 9c3b402a3ed8ddfcca0a2f5c99305221fe620ad5 | |
parent | 944dc03551f6e812c00e586edba84b28c52ffe8c (diff) |
jz4740: silence warnings related to mfd_get_cell changes
mfd_get_cell returns a const, so change the jz4740 clients to store
a const mfd cell. This silences type mismatch warnings.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/hwmon/jz4740-hwmon.c | 2 | ||||
-rw-r--r-- | drivers/power/jz4740-battery.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c index 40f106d95afe..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; |
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c index 0938650a466c..763f894ed188 100644 --- a/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c | |||
@@ -39,7 +39,7 @@ struct jz_battery { | |||
39 | int irq; | 39 | int irq; |
40 | int charge_irq; | 40 | int charge_irq; |
41 | 41 | ||
42 | struct mfd_cell *cell; | 42 | const struct mfd_cell *cell; |
43 | 43 | ||
44 | int status; | 44 | int status; |
45 | long voltage; | 45 | long voltage; |