linux-next: manual merge of the arm-soc tree with the pm tree

From: Stephen Rothwell
Date: Tue Oct 29 2013 - 04:00:41 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 ("PM / OPP: rename
header to linux/pm_opp.h") from the pm tree and commit 92d51856d740
("ARM: OMAP3+: do not register non-dt OPP tables for device tree boot")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-omap2/opp.c
index ec21e6eb03e1,82fd8c72f750..000000000000
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@@@ -17,7 -17,8 +17,8 @@@
* GNU General Public License for more details.
#include <linux/module.h>
+ #include <linux/of.h>
-#include <linux/opp.h>
+#include <linux/pm_opp.h>
#include <linux/cpu.h>

#include "omap_device.h"

Attachment: pgp00000.pgp
Description: PGP signature