Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / board.h

diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index dd044d7d318eb02748562358cac2bcc0a1ab653b..3763f3ed52ea39ae852cef7f2886d21069975f7e 100644 (file)
--- 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;