Hi Dave, On Tue, 23 Jun 2015 16:06:44 +0900 Inki Dae <[email protected]> wrote: > > This patch fixes the below build error reported by Stephen, > > Stephen reported: > After merging the drm-exynos tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs': > adv7604.c:(.text+0x586c): multiple definition of > `of_graph_get_endpoint_by_regs' > drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here > drivers/media/platform/soc_camera/atmel-isi.o: In function > `of_graph_get_endpoint_by_regs': > atmel-isi.c:(.text+0x1ec9): multiple definition of > `of_graph_get_endpoint_by_regs' > > drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): > first defined here > drivers/media/platform/soc_camera/rcar_vin.o: In function > `of_graph_get_endpoint_by_regs': > rcar_vin.c:(.text+0x307c): multiple definition of > `of_graph_get_endpoint_by_regs' > > drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): > first defined here > > Caused by commit: > a0f7001c18ca ("of: add helper for getting endpoint node of specific > identifiers") > > To fix the error, this patch declares of_graph_get_endpoint_by_regs function > with "static inline". > > Signed-off-by: Inki Dae <[email protected]>
In case it is not obvious, this is needed in the drm tree now. However, you seem to have been sent a rebased version of the drm-exynos tree and so the commit referred to above is commit 8ccd0d0ca041 in your tree. :-( Inki, please clean up your tree now that Dave has merged a rebased version of it (and please do *not* rebase your tree before asking Dave to merge it in the future - or if you must do that, then also update the branch that I include in linux-next first). -- Cheers, Stephen Rothwell [email protected]
pgpnV9s4eOB9h.pgp
Description: OpenPGP digital signature
