Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / arch / x86 / include / asm / mrst.h

diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 57a177a8e82393a225ec90de6acab750746a2ace..451d30e7f62defa446a864fb2ccd67e454697180 100644 (file)
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -11,5 +11,9 @@
 #ifndef _ASM_X86_MRST_H
 #define _ASM_X86_MRST_H
 extern int pci_mrst_init(void);
+int __init sfi_parse_mrtc(struct sfi_table_header *table);
+
+#define SFI_MTMR_MAX_NUM 8
+#define SFI_MRTC_MAX   8
 
 #endif /* _ASM_X86_MRST_H */