ARM: OMAP: No need to include board-innovator.h from hardware.h

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / hardware.h

diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h
index 6589ddbb63b2a4c17ea5b91965c7895cdc4c1b33..2a1377e230ca004894f79d9404d60c67559a72c0 100644 (file)
--- a/arch/arm/plat-omap/include/mach/hardware.h
+++ b/arch/arm/plat-omap/include/mach/hardware.h
@@ -294,32 +294,33 @@
  * ---------------------------------------------------------------------------
  */
 
-#ifdef CONFIG_MACH_OMAP_INNOVATOR
-#include "board-innovator.h"
+#ifdef CONFIG_MACH_OMAP_H4
+#include "board-h4.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_H2
-#include "board-h2.h"
+#if defined(CONFIG_MACH_NOKIA_N800) || defined(CONFIG_MACH_NOKIA770)
+#include "board-nokia.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_PERSEUS2
-#include "board-perseus2.h"
+#ifdef CONFIG_MACH_NOKIA_RX51
+#include "board-rx51.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_FSAMPLE
-#include "board-fsample.h"
+
+#ifdef CONFIG_MACH_OMAP_2430SDP
+#include "board-2430sdp.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_H3
-#include "board-h3.h"
+#ifdef CONFIG_MACH_OMAP2EVM
+#include "board-omap2evm.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_H4
-#include "board-h4.h"
+#ifdef CONFIG_MACH_OMAP_3430SDP
+#include "board-3430sdp.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_2430SDP
-#include "board-2430sdp.h"
+#ifdef CONFIG_MACH_OMAP3EVM
+#include "board-omap3evm.h"
 #endif
 
 #ifdef CONFIG_MACH_OMAP3_BEAGLE