All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 13/13] ARM: OMAP: Remove remaining board-*.h includes from hardware.h
Date: Thu, 26 Feb 2009 16:08:57 -0800	[thread overview]
Message-ID: <20090227000856.20192.42137.stgit@localhost> (raw)
In-Reply-To: <20090226235042.20192.38338.stgit@localhost>

Also remove board-omap3beagle.h that is not included anywhere,
and move protoype for voiceblue_reset() from board-voiceblue.h
to system.h.

After this patch there are still board-ams-delta.h, board-sx1.h
and board-voiceblue.h that export some functions. These could
be removed if the functions were moved under drivers.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 .../arm/plat-omap/include/mach/board-omap3beagle.h |   33 --------------------
 arch/arm/plat-omap/include/mach/board-voiceblue.h  |    1 -
 arch/arm/plat-omap/include/mach/hardware.h         |   22 -------------
 arch/arm/plat-omap/include/mach/system.h           |    2 +
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/mach/board-omap3beagle.h

diff --git a/arch/arm/plat-omap/include/mach/board-omap3beagle.h b/arch/arm/plat-omap/include/mach/board-omap3beagle.h
deleted file mode 100644
index 3080d52..0000000
--- a/arch/arm/plat-omap/include/mach/board-omap3beagle.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/board-omap3beagle.h
- *
- * Hardware definitions for TI OMAP3 BEAGLE.
- *
- * Initial creation by Syed Mohammed Khasim <khasim@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ASM_ARCH_OMAP3_BEAGLE_H
-#define __ASM_ARCH_OMAP3_BEAGLE_H
-
-#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */
-
diff --git a/arch/arm/plat-omap/include/mach/board-voiceblue.h b/arch/arm/plat-omap/include/mach/board-voiceblue.h
index ed6d346..27916b2 100644
--- a/arch/arm/plat-omap/include/mach/board-voiceblue.h
+++ b/arch/arm/plat-omap/include/mach/board-voiceblue.h
@@ -14,7 +14,6 @@
 extern void voiceblue_wdt_enable(void);
 extern void voiceblue_wdt_disable(void);
 extern void voiceblue_wdt_ping(void);
-extern void voiceblue_reset(void);
 
 #endif /*  __ASM_ARCH_VOICEBLUE_H */
 
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h
index bba9498..3dc423e 100644
--- a/arch/arm/plat-omap/include/mach/hardware.h
+++ b/arch/arm/plat-omap/include/mach/hardware.h
@@ -286,26 +286,4 @@
 #include "omap24xx.h"
 #include "omap34xx.h"
 
-#ifndef __ASSEMBLER__
-
-/*
- * ---------------------------------------------------------------------------
- * Board specific defines
- * ---------------------------------------------------------------------------
- */
-
-#ifdef CONFIG_MACH_OMAP3_BEAGLE
-#include "board-omap3beagle.h"
-#endif
-
-#ifdef CONFIG_MACH_VOICEBLUE
-#include "board-voiceblue.h"
-#endif
-
-#ifdef CONFIG_MACH_SX1
-#include "board-sx1.h"
-#endif
-
-#endif /* !__ASSEMBLER__ */
-
 #endif	/* __ASM_ARCH_OMAP_HARDWARE_H */
diff --git a/arch/arm/plat-omap/include/mach/system.h b/arch/arm/plat-omap/include/mach/system.h
index 06923f2..8422845 100644
--- a/arch/arm/plat-omap/include/mach/system.h
+++ b/arch/arm/plat-omap/include/mach/system.h
@@ -11,6 +11,8 @@
 
 #ifndef CONFIG_MACH_VOICEBLUE
 #define voiceblue_reset()		do {} while (0)
+#else
+extern void voiceblue_reset(void);
 #endif
 
 extern void omap_prcm_arch_reset(char mode);


  parent reply	other threads:[~2009-02-27  0:09 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-26 23:52 [PATCH 00/13] Omap header clean-up for next merge window Tony Lindgren
2009-02-26 23:53 ` [PATCH 01/13] ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h Tony Lindgren
2009-02-26 23:54 ` [PATCH 02/13] ARM: OMAP: No need to include board-h2.h " Tony Lindgren
2009-02-26 23:56 ` [PATCH 03/13] ARM: OMAP: No need to include board-h3.h " Tony Lindgren
2009-02-26 23:57 ` [PATCH 04/13] ARM: OMAP: No need to include board-innovator.h " Tony Lindgren
2009-02-26 23:58 ` [PATCH 05/13] ARM: OMAP: No need to include board-osk.h " Tony Lindgren
2009-02-26 23:59 ` [PATCH 06/13] ARM: OMAP: No need to include board-palm*.h " Tony Lindgren
2009-02-27  0:01 ` [PATCH 07/13] ARM: OMAP: No need to include board-omap2430sdp.h " Tony Lindgren
2009-02-27  0:13   ` Felipe Balbi
2009-02-27  3:11     ` Tony Lindgren
2009-02-27  0:02 ` [PATCH 08/13] ARM: OMAP: No need to include board-apollon.h " Tony Lindgren
2009-02-27  0:03 ` [PATCH 09/13] ARM: OMAP: No need to include board-h4.h " Tony Lindgren
2009-02-27  0:05 ` [PATCH 10/13] ARM: OMAP: No need to include board-ldp.h " Tony Lindgren
2009-02-27  0:06 ` [PATCH 11/13] ARM: OMAP: No need to include board-overo.h " Tony Lindgren
2009-02-27  0:07 ` [PATCH 12/13] ARM: OMAP: No need to include board-nokia.h " Tony Lindgren
2009-02-27  0:08 ` Tony Lindgren [this message]
2009-02-27 20:11 ` [PATCH 00/13] Omap header clean-up for next merge window Russell King - ARM Linux
2009-03-04 17:53   ` Tony Lindgren

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=20090227000856.20192.42137.stgit@localhost \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --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.