[lkml]   [2012]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the tegra tree with the arm tree
Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit daa14d5e60e0 ("ARM:
mach-tegra: properly disable CPU idle call") from the arm tree and commit
65fe31da5ced ("ARM: tegra: support for Tegra30 CPU powerdomains") from
the tegra tree.

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

diff --cc arch/arm/mach-tegra/common.c
index 2db20da,09dc37fc..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,6 -27,8 +27,7 @@@
#include <asm/hardware/gic.h>

#include <mach/iomap.h>
-#include <mach/system.h>
+ #include <mach/powergate.h>

#include "board.h"
#include "clock.h"
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-02-27 00:43    [W:0.021 / U:1.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site