]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66f41d4) | patch
omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2
authorTony Lindgren <tony@atomide.com>
Fri, 30 Apr 2010 19:57:13 +0000 (12:57 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 May 2010 00:21:31 +0000 (17:21 -0700)
commitdaa494958a59638f32b4334155e4c3e1f664c675
treed28520cec2b0c66d4aee870579025a82a39f0f43tree | snapshot (tar.bz2 tar.gz zip)
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8commit | diff
omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2

Otherwise we'll get an error about get_irqnr_and_base being defined
twice. Add an entry for omap4, and use ARCH_OMAP3 for omap3 instead of
ARCH_OMAP3430.

Also fix the check for omap1 to use ARCH_OMAP2PLUS to avoid having to
add ARCH_OMAP4 separately there.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/include/plat/multi.h diff | blob | blame | history
Clone of davem's net-next-2.6 tree