Tony Lindgren deee6d5359 ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes ...

ARM restart changes needed changes to common.h to make it local.
This conflicted with v3.2-rc4 DSS related hwmod changes that
git mergetool was not able to handle.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2011-12-06 20:27:02 +00:00

8.4 KiB

Raw Blame History

View Raw