summaryrefslogtreecommitdiff
path: root/drivers/mfd/arizona.h
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-02 17:28:46 +0400
committerLee Jones <lee.jones@linaro.org>2014-07-09 19:38:01 +0400
commit942786e6e647cef94cf96dcd836d343be55fc452 (patch)
treec3fd1872c504dfd7181d753d102dbac9c6ddcbe1 /drivers/mfd/arizona.h
parentc00572bc94684a61628a7f6f34f5ce64345742cc (diff)
downloadlinux-942786e6e647cef94cf96dcd836d343be55fc452.tar.xz
mfd: arizona: Rid data size incompatibility warn when building for 64bit
Extinguishes: ../drivers/mfd/arizona-core.c: In function ‘arizona_of_get_type’: ../drivers/mfd/arizona-core.c:505:10: warning: cast from pointer to integer of different size Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/arizona.h')
-rw-r--r--drivers/mfd/arizona.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h
index b4cef777df73..2951498ab9a1 100644
--- a/drivers/mfd/arizona.h
+++ b/drivers/mfd/arizona.h
@@ -46,9 +46,9 @@ int arizona_irq_init(struct arizona *arizona);
int arizona_irq_exit(struct arizona *arizona);
#ifdef CONFIG_OF
-int arizona_of_get_type(struct device *dev);
+unsigned long arizona_of_get_type(struct device *dev);
#else
-static inline int arizona_of_get_type(struct device *dev)
+static inline unsigned long arizona_of_get_type(struct device *dev)
{
return 0;
}