git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3522bf7)
ARM: OMAP2+: Fix build for dra7xx without omap4 and 5 omap-for-v3.13/fixes-for-merge-window-take2
authorTony Lindgren <tony@atomide.com>
Fri, 15 Nov 2013 16:27:29 +0000 (08:27 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 15 Nov 2013 16:27:29 +0000 (08:27 -0800)
Otherwise we can get errors like:

arch/arm/mach-omap2/prm44xx.c:274: error: redefinition of ‘omap44xx_prm_reconfigure_io_chain’
arch/arm/mach-omap2/built-in.o: In function `default_finish_suspend':
arch/arm/mach-omap2/omap-mpuss-lowpower.c:95: undefined reference to `omap_do_wfi'

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Makefile patch | blob | history
arch/arm/mach-omap2/prm44xx_54xx.h patch | blob | history

diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/mach-omap2/prm44xx_54xx.h
Simple merge
Pandora Kernel Repository