[lkml]   [2011]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the mfd tree with the arm-soc tree
Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-imx/mach-mx31moboard.c between commit 40d97b89bd3c
("mx31moboard: Add poweroff support") from the arm-soc tree and commit
1ab50c862862 ("ARM: imx/mx31moboard: Add mc13783 power button support")
from the mfd tree.

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

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
index fff7791,f7e302d..0000000
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@@ -28,9 -28,7 +28,10 @@@
#include <linux/spi/spi.h>
#include <linux/types.h>
#include <linux/memblock.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/err.h>
+ #include <linux/input.h>

#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2011-10-11 07:43    [W:0.025 / U:0.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site