Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/plat-omap/include/mach/board-nokia.h b/arch/arm/plat-omap/include/mach/board-nokia.h
index 2abbe001af8c43535a97624cd5a309d1cf4cc2fc..198d761136b5e3e4003acf1909261ca0fe5a1e9a 100644 (file)
--- a/arch/arm/plat-omap/include/mach/board-nokia.h
+++ b/arch/arm/plat-omap/include/mach/board-nokia.h
@@ -6,17 +6,30 @@
  *  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>
 
+struct tsc2301_platform_data;
+struct dsp_kfunc_device;
+extern void n800_bt_init(void);
+extern void n800_dsp_init(void);
+extern void n800_flash_init(void);
+extern void n800_mmc_init(void);
+extern void n800_pm_init(void);
+extern void n800_usb_init(void);
+extern void n800_cam_init(void);
+extern void n800_audio_init(struct tsc2301_platform_data *);
+extern int n800_audio_enable(struct dsp_kfunc_device *kdev, int stage);
+extern int n800_audio_disable(struct dsp_kfunc_device *kdev, int stage);
+extern void n800_mmc_slot1_cover_handler(void *arg, int state);
+
 #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