From: Arnd Bergmann <arnd@arndb.de>
To: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@infradead.org, arm@kernel.org,
Arnd Bergmann <arnd@arndb.de>, Imre Kaloz <kaloz@openwrt.org>,
Krzysztof Halasa <khc@pm.waw.pl>,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH 7/8] ARM: ixp4xx: avoid circular header dependency
Date: Fri, 5 Jul 2013 18:23:36 +0200 [thread overview]
Message-ID: <1373041417-217728-8-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1373041417-217728-1-git-send-email-arnd@arndb.de>
With the new linux/reboot.h header file dependency added, we can no
longer build ixp4xx. The easiest way to avoid that is to remove the
inclusion of mach/hardware.h from mach/timex.h, which does not need
that header anyway.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/mach-ixp4xx/include/mach/timex.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-ixp4xx/include/mach/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h
index c9e930f..0396d89 100644
--- a/arch/arm/mach-ixp4xx/include/mach/timex.h
+++ b/arch/arm/mach-ixp4xx/include/mach/timex.h
@@ -3,7 +3,7 @@
*
*/
-#include <mach/hardware.h>
+#include <mach/ixp4xx-regs.h>
/*
* We use IXP425 General purpose timer for our timer needs, it runs at
--
1.8.3.1
next prev parent reply other threads:[~2013-07-05 16:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 16:23 [PATCH 0/8] ARM: SoC specific bug fixes Arnd Bergmann
2013-07-05 16:23 ` [PATCH 1/8] clocksource: armada-xp: always register local_timer_ops Arnd Bergmann
2013-07-05 16:33 ` Gregory CLEMENT
2013-07-05 16:57 ` Stephen Boyd
2013-07-05 16:23 ` [PATCH 2/8] ARM: omap5: omap5 has SCU and TWD Arnd Bergmann
2013-07-08 12:03 ` Tony Lindgren
2013-07-05 16:23 ` [PATCH 3/8] ARM: zynq: use DT_MACHINE_START Arnd Bergmann
2013-07-08 6:18 ` Michal Simek
2013-07-05 16:23 ` [PATCH 4/8] ARM: OMAP: build mach-omap code only if needed Arnd Bergmann
2013-07-08 11:31 ` Olof Johansson
2013-07-08 11:34 ` Olof Johansson
2013-07-08 12:00 ` Tony Lindgren
2013-07-05 16:23 ` [PATCH 5/8] ARM: sti: move DEBUG_STI_UART into alphabetical order Arnd Bergmann
2013-07-05 16:23 ` [PATCH 6/8] ARM: OMAP: omap_common_late_init may be unused Arnd Bergmann
2013-07-08 12:01 ` Tony Lindgren
2013-07-05 16:23 ` Arnd Bergmann [this message]
2013-07-06 18:11 ` [PATCH 7/8] ARM: ixp4xx: avoid circular header dependency Krzysztof Halasa
2013-07-05 16:23 ` [PATCH 8/8] ARM: exynos: select PM_GENERIC_DOMAINS only when used Arnd Bergmann
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=1373041417-217728-8-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=jason@lakedaemon.net \
--cc=kaloz@openwrt.org \
--cc=khc@pm.waw.pl \
--cc=linux-arm-kernel@infradead.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®