]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
authorKevin Hilman <khilman@ti.com>
Fri, 22 Jun 2012 14:40:02 +0000 (08:40 -0600)
committerPaul Walmsley <paul@pwsan.com>
Fri, 22 Jun 2012 14:40:02 +0000 (08:40 -0600)
commit75a4433e409b2d22cbe443b623d92047b59cbb9a
tree605bcd972e478de3d1320654159544f28821dee3
parent485802a6c524e62b5924849dd727ddbb1497cc71
ARM: OMAP2+: PRM: fix compile for OMAP4-only build

For OMAP4 only builds, the omap2_prm_* functions have dummy wrappers
to detect incorrect usage.  However, several unrelated omap3 PRM
functions have made it inside the #else clause of the #ifdef wrapping
the omap2_prm stubs, causing them to disappear on OMAP4-only builds.

This was unnoticed until the IO chain support was added and introduced
a new function in this section which is referenced by omap_hwmod.c:

arch/arm/mach-omap2/omap_hwmod.c: In function '_reconfigure_io_chain':
arch/arm/mach-omap2/omap_hwmod.c:1665:3: error: implicit declaration of function 'omap3xxx_prm_reconfigure_io_chain' [-Werror=implicit-function-declaration]

Fix by using the #ifdef to only wrap the omap2_prm functions that
need stubs on OMAP4-only builds.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
[paul@pwsan.com: fixed checkpatch warnings for patch description]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/prm2xxx_3xxx.h