aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-01-23 14:35:28 +0000
committerLee Jones <lee.jones@linaro.org>2014-02-19 13:30:23 +0000
commit05fb7a56ad65ceaa1907bb9c66bfa1108847667f (patch)
treed0d19b7006cf50a06cefc6b267a29bf405a780e5 /include/linux
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
mfd: max8997: Naturalise cross-architecture discrepancies
If we compile the MAX8997 for a 64bit architecture we receive the following warnings: drivers/mfd/max8997.c: In function ‘max8997_i2c_get_driver_data’: drivers/mfd/max8997.c:173:10: warning: cast from pointer to integer of different size return (int)match->data; ^ Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/max8997-private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index ad1ae7f345ad..78c76cd4d37b 100644
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -387,7 +387,7 @@ struct max8997_dev {
struct i2c_client *muic; /* slave addr 0x4a */
struct mutex iolock;
- int type;
+ unsigned long type;
struct platform_device *battery; /* battery control (not fuel gauge) */
int irq;

Privacy Policy