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

board-*.h are always included from hardware.h
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

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>
 

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;

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