[PATCH] ARCH: OMAP: Move board-nokia.h to hardware.h where it belongs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



board-*.h are always included from hardware.h

Signed-off-by: Felipe Balbi <felipe.lima@xxxxxxxxxxx>
---
 include/asm-arm/arch-omap/board-nokia.h |    4 ++--
 include/asm-arm/arch-omap/board.h       |    3 ---
 include/asm-arm/arch-omap/hardware.h    |    4 ++++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/asm-arm/arch-omap/board-nokia.h b/include/asm-arm/arch-omap/board-nokia.h
index fa4f0a6..8e26e96 100644
--- a/include/asm-arm/arch-omap/board-nokia.h
+++ b/include/asm-arm/arch-omap/board-nokia.h
@@ -6,8 +6,8 @@
  *  Copyright (C) 2005	Nokia Corporation
  */
 
-#ifndef _OMAP_BOARD_NOKIA_H
-#define _OMAP_BOARD_NOKIA_H
+#ifndef __ASM_ARCH_OMAP_NOKIA_H
+#define __ASM_ARCH_OMAP_NOKIA_H
 
 #include <linux/types.h>
 
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index dd044d7..3763f3e 100644
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@ -169,9 +169,6 @@ struct omap_version_config {
 	char version[12];
 };
 
-
-#include <asm-arm/arch-omap/board-nokia.h>
-
 struct omap_board_config_entry {
 	u16 tag;
 	u16 len;
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h
index 98e89e5..54a8246 100644
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
@@ -319,6 +319,10 @@
 #include "board-h4.h"
 #endif
 
+#if defined(CONFIG_MACH_NOKIA_N800) || defined(CONFIG_MACH_NOKIA770)
+#include "board-nokia.h"
+#endif
+
 #ifdef CONFIG_MACH_OMAP_2430SDP
 #include "board-2430sdp.h"
 #endif
-- 
1.5.4.rc0.56.g6fbe

-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux