ARM: OMAP: omap2/memory.c compile fixes
authorDavid Brownell <dbrownell@users.sourceforge.net>
Thu, 7 Dec 2006 01:13:54 +0000 (17:13 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 15 Sep 2007 19:41:06 +0000 (12:41 -0700)
Remove some conflicting declarations in omap2/memory.c so that the
file builds again.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/memory.c

Simple merge