From: paul.gortmaker@windriver.com (Paul Gortmaker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] arm: anticipate build breakages due in pending merge
Date: Mon, 5 Mar 2012 17:41:48 -0500 [thread overview]
Message-ID: <1330987310-8108-2-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1330987310-8108-1-git-send-email-paul.gortmaker@windriver.com>
Testing in linux-next has revealed that the omap2plus_defconfig
will fail upon the merge of "arm-soc/for-next" as follows:
arch/arm/mach-omap2/control.c:238: error: 'OMAP343X_CTRL_BASE' undeclared (first use in this function)
arch/arm/mach-omap2/common.c:48: error: 'OMAP2420_SDRC_BASE' undeclared here (not in a function)
arch/arm/mach-omap2/common.c:49: error: 'OMAP2420_SMS_BASE' undeclared here (not in a function)
arch/arm/mach-omap2/common.c:50: error: 'OMAP242X_CTRL_BASE' undeclared here (not in a function)
[...]
arch/arm/mach-omap2/common.c:167: error: 'OMAP4430_CM2_BASE' undeclared here (not in a function)
arch/arm/mach-omap2/sdrc2xxx.c:108: error: 'OMAP2420_PRM_BASE' undeclared (first use in this function)
arch/arm/mach-omap2/cm2xxx_3xxx.c:310: error: 'OMAP3430_CM_BASE' undeclared (first use in this function)
It appears that a once implicit path to <plat/hardware.h> has gone
away once two of the arm streams come together.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 ++
arch/arm/mach-omap2/common.c | 1 +
arch/arm/mach-omap2/control.c | 1 +
arch/arm/mach-omap2/sdrc2xxx.c | 1 +
4 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.c b/arch/arm/mach-omap2/cm2xxx_3xxx.c
index c79ed63..389f9f8 100644
--- a/arch/arm/mach-omap2/cm2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c
@@ -18,6 +18,8 @@
#include <linux/err.h>
#include <linux/io.h>
+#include <plat/hardware.h>
+
#include "iomap.h"
#include "common.h"
#include "cm.h"
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 93419de..d620362 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -20,6 +20,7 @@
#include <plat/board.h>
#include <plat/mux.h>
#include <plat/clock.h>
+#include <plat/hardware.h>
#include "iomap.h"
#include "common.h"
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 2fd5fd1..18ff359 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -16,6 +16,7 @@
#include <linux/io.h>
#include <plat/sdrc.h>
+#include <plat/hardware.h>
#include "iomap.h"
#include "common.h"
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c
index 2c329a6..181b0c5 100644
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -27,6 +27,7 @@
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sdrc.h>
+#include <plat/hardware.h>
#include "iomap.h"
#include "common.h"
--
1.7.9.1
next prev parent reply other threads:[~2012-03-05 22:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 22:41 [PATCH 0/3] arm: fix build breakage in omap2plus_defconfig (linux-next) Paul Gortmaker
2012-03-05 22:41 ` Paul Gortmaker [this message]
2012-03-05 22:45 ` [PATCH 1/3] arm: anticipate build breakages due in pending merge Tony Lindgren
2012-03-05 22:41 ` [PATCH 2/3] arm: fix compile error in mach-omap2/board-omap4panda.c Paul Gortmaker
2012-03-05 22:46 ` Tony Lindgren
2012-03-06 11:03 ` Peter Ujfalusi
2012-03-05 22:41 ` [PATCH 3/3] arm: more fallout from i2c conversions in board-omap4panda.c Paul Gortmaker
2012-03-06 12:27 ` Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330987310-8108-2-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).