From 2540da839ea4c21638c72df0e1779072dfb9e900 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Mar 2009 18:07:38 -0700
Subject: [PATCH] --- yaml --- r: 137475 b: refs/heads/master c:
 d40cdf080deac7dfa1b3c6ea216db97e872de1b2 h: refs/heads/master i:   137473:
 294f47042b58a049ce6b8315c89ddff2127e2529   137471:
 2e32a7919a9197a6c935e4b230db622908d1ad2e v: v3

---
 [refs]                                        |  2 +-
 .../arm/plat-omap/include/mach/board-nokia.h  | 54 -------------------
 trunk/arch/arm/plat-omap/include/mach/board.h |  3 --
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 trunk/arch/arm/plat-omap/include/mach/board-nokia.h

diff --git a/[refs] b/[refs]
index 41f44d3b4164..927392ef5afd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d4d9ab08ac28b4742dadc35b5ac7613abf71475
+refs/heads/master: d40cdf080deac7dfa1b3c6ea216db97e872de1b2
diff --git a/trunk/arch/arm/plat-omap/include/mach/board-nokia.h b/trunk/arch/arm/plat-omap/include/mach/board-nokia.h
deleted file mode 100644
index 2abbe001af8c..000000000000
--- a/trunk/arch/arm/plat-omap/include/mach/board-nokia.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  arch/arm/plat-omap/include/mach/board-nokia.h
- *
- *  Information structures for Nokia-specific board config data
- *
- *  Copyright (C) 2005	Nokia Corporation
- */
-
-#ifndef _OMAP_BOARD_NOKIA_H
-#define _OMAP_BOARD_NOKIA_H
-
-#include <linux/types.h>
-
-#define OMAP_TAG_NOKIA_BT	0x4e01
-#define OMAP_TAG_WLAN_CX3110X	0x4e02
-#define OMAP_TAG_CBUS		0x4e03
-#define OMAP_TAG_EM_ASIC_BB5	0x4e04
-
-
-#define BT_CHIP_CSR		1
-#define BT_CHIP_TI		2
-
-#define BT_SYSCLK_12		1
-#define BT_SYSCLK_38_4		2
-
-struct omap_bluetooth_config {
-	u8    chip_type;
-	u8    bt_wakeup_gpio;
-	u8    host_wakeup_gpio;
-	u8    reset_gpio;
-	u8    bt_uart;
-	u8    bd_addr[6];
-	u8    bt_sysclk;
-};
-
-struct omap_wlan_cx3110x_config {
-	u8  chip_type;
-	s16 power_gpio;
-	s16 irq_gpio;
-	s16 spi_cs_gpio;
-};
-
-struct omap_cbus_config {
-	s16 clk_gpio;
-	s16 dat_gpio;
-	s16 sel_gpio;
-};
-
-struct omap_em_asic_bb5_config {
-	s16 retu_irq_gpio;
-	s16 tahvo_irq_gpio;
-};
-
-#endif
diff --git a/trunk/arch/arm/plat-omap/include/mach/board.h b/trunk/arch/arm/plat-omap/include/mach/board.h
index 9466772fc7c8..4a0afd2366e8 100644
--- a/trunk/arch/arm/plat-omap/include/mach/board.h
+++ b/trunk/arch/arm/plat-omap/include/mach/board.h
@@ -133,9 +133,6 @@ struct omap_version_config {
 	char version[12];
 };
 
-
-#include <mach/board-nokia.h>
-
 struct omap_board_config_entry {
 	u16 tag;
 	u16 len;