Commit deee6d53 authored Dec 06, 2011 by Tony Lindgren Committed by Russell King Dec 06, 2011

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>

parent 16edc3df

arch/arm/mach-omap2/display.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,12 +22,13 @@
		#include <linux/io.h>
		#include <linux/clk.h>
		#include <linux/err.h>
		#include <linux/delay.h>

		#include <video/omapdss.h>
		#include <plat/omap_hwmod.h>
		#include <plat/omap_device.h>
		#include <plat/omap-pm.h>
		#include <plat/common.h>
		#include "common.h"

		#include "control.h"
		#include "display.h"