All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] arm: plat-omap: system.h: move voiceblue definitions into the board header
Date: Tue, 18 Jan 2011 09:52:44 +0200	[thread overview]
Message-ID: <1295337165-22934-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1295337165-22934-1-git-send-email-aaro.koskinen@iki.fi>

Move voiceblue definitions into the board-specific header.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/arm/plat-omap/include/plat/board-voiceblue.h |    6 ++++++
 arch/arm/plat-omap/include/plat/system.h          |    7 +------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/board-voiceblue.h b/arch/arm/plat-omap/include/plat/board-voiceblue.h
index 27916b2..431d70e 100644
--- a/arch/arm/plat-omap/include/plat/board-voiceblue.h
+++ b/arch/arm/plat-omap/include/plat/board-voiceblue.h
@@ -15,5 +15,11 @@ extern void voiceblue_wdt_enable(void);
 extern void voiceblue_wdt_disable(void);
 extern void voiceblue_wdt_ping(void);
 
+#ifndef CONFIG_MACH_VOICEBLUE
+#define voiceblue_reset()		do {} while (0)
+#else
+extern void voiceblue_reset(void);
+#endif
+
 #endif /*  __ASM_ARCH_VOICEBLUE_H */
 
diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h
index d0a119f..24bb5ae 100644
--- a/arch/arm/plat-omap/include/plat/system.h
+++ b/arch/arm/plat-omap/include/plat/system.h
@@ -9,14 +9,9 @@
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 
+#include <plat/board-voiceblue.h>
 #include <plat/prcm.h>
 
-#ifndef CONFIG_MACH_VOICEBLUE
-#define voiceblue_reset()		do {} while (0)
-#else
-extern void voiceblue_reset(void);
-#endif
-
 static inline void arch_idle(void)
 {
 	cpu_do_idle();
-- 
1.5.6.5


WARNING: multiple messages have this Message-ID (diff)
From: aaro.koskinen@iki.fi (Aaro Koskinen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] arm: plat-omap: system.h: move voiceblue definitions into the board header
Date: Tue, 18 Jan 2011 09:52:44 +0200	[thread overview]
Message-ID: <1295337165-22934-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1295337165-22934-1-git-send-email-aaro.koskinen@iki.fi>

Move voiceblue definitions into the board-specific header.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/arm/plat-omap/include/plat/board-voiceblue.h |    6 ++++++
 arch/arm/plat-omap/include/plat/system.h          |    7 +------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/board-voiceblue.h b/arch/arm/plat-omap/include/plat/board-voiceblue.h
index 27916b2..431d70e 100644
--- a/arch/arm/plat-omap/include/plat/board-voiceblue.h
+++ b/arch/arm/plat-omap/include/plat/board-voiceblue.h
@@ -15,5 +15,11 @@ extern void voiceblue_wdt_enable(void);
 extern void voiceblue_wdt_disable(void);
 extern void voiceblue_wdt_ping(void);
 
+#ifndef CONFIG_MACH_VOICEBLUE
+#define voiceblue_reset()		do {} while (0)
+#else
+extern void voiceblue_reset(void);
+#endif
+
 #endif /*  __ASM_ARCH_VOICEBLUE_H */
 
diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h
index d0a119f..24bb5ae 100644
--- a/arch/arm/plat-omap/include/plat/system.h
+++ b/arch/arm/plat-omap/include/plat/system.h
@@ -9,14 +9,9 @@
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 
+#include <plat/board-voiceblue.h>
 #include <plat/prcm.h>
 
-#ifndef CONFIG_MACH_VOICEBLUE
-#define voiceblue_reset()		do {} while (0)
-#else
-extern void voiceblue_reset(void);
-#endif
-
 static inline void arch_idle(void)
 {
 	cpu_do_idle();
-- 
1.5.6.5

  parent reply	other threads:[~2011-01-18  7:52 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-18  7:52 [PATCH 0/7] omap1 sparse warning fixes Aaro Koskinen
2011-01-18  7:52 ` Aaro Koskinen
2011-01-18  7:52 ` [PATCH 1/7] arm: plat-omap: dma: make omap_dma_in_1510_mode() static Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  7:52 ` [PATCH 2/7] arm: mach-omap1: board-h2: make h2_nand_platdata static Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  7:52 ` [PATCH 3/7] arm: mach-omap1: board-innovator: make innovator_mmc_init() static Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  7:52 ` [PATCH 4/7] arm: mach-omap1: board-htcherald: make htcpld_chips and htcpld_pfdata static Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  7:52 ` [PATCH 5/7] arm: mach-omap1: board-h3: make nand_platdata static Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  7:52 ` Aaro Koskinen [this message]
2011-01-18  7:52   ` [PATCH 6/7] arm: plat-omap: system.h: move voiceblue definitions into the board header Aaro Koskinen
2011-01-18  9:22   ` Russell King - ARM Linux
2011-01-18  9:22     ` Russell King - ARM Linux
2011-01-20  1:26     ` Tony Lindgren
2011-01-20  1:26       ` Tony Lindgren
2011-01-18  7:52 ` [PATCH 7/7] arm: mach-omap1: board-voiceblue: add missing include Aaro Koskinen
2011-01-18  7:52   ` Aaro Koskinen
2011-01-18  8:11   ` Felipe Balbi
2011-01-18  8:11     ` Felipe Balbi
2011-01-18  8:21     ` Felipe Balbi
2011-01-18  8:21       ` Felipe Balbi

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=1295337165-22934-7-git-send-email-aaro.koskinen@iki.fi \
    --to=aaro.koskinen@iki.fi \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.