diff options
| author |   Stephen Warren <swarren@nvidia.com> | 2013-01-29 20:56:17 -0700 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2013-01-31 19:55:31 -0800 |
| commit | 80debae58435423def63632273139ee5fcb99c69 (patch) | |
| tree | 414dd325ecd811d770ec38a2664ddf05da76d567 /include/linux/clocksource.h | |
| parent | Merge branch 'zynq/timer' of git://git.xilinx.com/linux-xlnx into next/cleanup (diff) | |
| download | linux-dev-80debae58435423def63632273139ee5fcb99c69.tar.xz linux-dev-80debae58435423def63632273139ee5fcb99c69.zip | |
ARM: imx: fix imx31-dt.c time-related warning
Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following:
arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default]
arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default]
This is because mx31_clocks_init_dt() returns int, whereas the .init_time
field prototype expects a function returning void. Implement a wrapper so
that the prototypes match.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/clocksource.h')
0 files changed, 0 insertions, 0 deletions