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

Browse source

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>

...

This commit is contained in:

Tony Lindgren 2011-12-06 17:50:42 +01:00 • committed by Russell King

parent 16edc3df8a

commit deee6d5359

1 changed files with 2 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/arm/mach-omap2/display.c

View file