renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code
80debae584
linux-next/arch/arm
History
Stephen Warren 80debae584 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>
2013-01-31 19:55:31 -08:00
..
boot Merge branch 'vexpress/fixes' of git://git.linaro.org/people/pawelmoll/linux into fixes 2013-01-24 08:12:24 -08:00
common irqchip: Move ARM VIC to drivers/irqchip 2013-01-12 10:52:14 -06:00
configs I have left out the patch (ARM: dts: imx: use nodes label in board dts) 2013-01-29 09:41:02 -08:00
crypto
include I have left out the patch (ARM: dts: imx: use nodes label in board dts) 2013-01-29 09:41:02 -08:00
kernel Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
lib ARM: export default read_current_timer 2012-10-09 20:24:36 +02:00
mach-at91 Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
mach-bcm ARM: remove redundant 'select GENERIC_GPIO' 2013-01-22 00:01:50 -08:00
mach-bcm2835 ARM: bcm2835: make use of CLKSRC_OF 2013-01-14 21:45:58 -07:00
mach-clps711x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cns3xxx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-davinci Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-dove cleanup for v3.9 round2 2013-01-29 14:53:13 -08:00
mach-ebsa110 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ep93xx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-exynos Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-footbridge Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-gemini ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-h720x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-highbank Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-imx ARM: imx: fix imx31-dt.c time-related warning 2013-01-31 19:55:31 -08:00
mach-integrator Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
mach-iop13xx Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-iop32x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-iop33x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ixp4xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-kirkwood cleanup for v3.9 round2 2013-01-29 14:53:13 -08:00
mach-ks8695 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-mmp Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-msm Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-mv78xx0 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-mvebu Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
mach-mxs Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-netx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-nomadik Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-omap1 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-omap2 Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
mach-orion5x Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-picoxcell ARM: remove redundant 'select GENERIC_GPIO' 2013-01-22 00:01:50 -08:00
mach-prima2 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-pxa Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanup 2013-01-27 22:33:42 -08:00
mach-realview Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-rpc ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-s3c24xx Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-s3c64xx Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
mach-s3c2410
mach-s3c2412 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2440 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5p64x0 Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-s5pc100 Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-s5pv210 Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-sa1100 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-shark ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-shmobile Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-socfpga Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-spear3xx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-spear6xx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-spear13xx Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-sunxi Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-tegra Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-u300 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-ux500 Removal of the <mach/id.h> include from ux500 2013-01-29 16:06:03 -08:00
mach-versatile Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-vexpress Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
mach-vt8500 ARM: remove redundant 'select GENERIC_GPIO' 2013-01-22 00:01:50 -08:00
mach-w90x900 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-zynq arm: zynq: Add missing irqchip.h to common.c 2013-01-29 10:55:28 -08:00
mm ARM: 7629/1: mm: Fix missing XN flag for for MT_MEMORY_SO 2013-01-19 11:41:25 +00:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
nwfpe
oprofile
plat-iop ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-omap ARM: arm-soc fixes for 3.8-rc 2013-01-08 18:53:56 -08:00
plat-orion ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-pxa ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
plat-s3c24xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
plat-samsung Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup 2013-01-14 21:44:27 -07:00
plat-spear ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-versatile Linux 3.8-rc5 2013-01-27 22:07:20 -08:00
tools ARM: boot: Fix usage of kecho 2012-11-12 23:22:54 +01:00
vfp ARM: 7627/1: Predicate preempt logic on PREEMP_COUNT not PREEMPT alone 2013-01-16 16:51:10 +00:00
xen Features: 2012-12-13 14:29:16 -08:00
Kconfig ARM: bcm2835: cleanup 2013-01-29 09:53:55 -08:00
Kconfig-nommu
Kconfig.debug ARM: imx: Remove mx508 support 2013-01-29 14:05:43 +08:00
Makefile ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00