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

From: Stephen Rothwell
Date: Mon May 14 2012 - 04:47:51 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c between commit 2890c63138a4 ("mtd:
gpmi: add device tree support to gpmi-nand") from the l2-mtd tree and
commit 39febc018bd2 ("mtd: nand: gpmi: adopt pinctrl support") from the
arm-soc tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 95f2af8,8478fd9..0000000
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@@ -24,8 -24,7 +24,9 @@@
#include <linux/module.h>
#include <linux/mtd/gpmi-nand.h>
#include <linux/mtd/partitions.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+ #include <linux/pinctrl/consumer.h>
#include "gpmi-nand.h"

/* add our owner bbt descriptor */

Attachment: pgp00000.pgp
Description: PGP signature