Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block

[linux-2.6-omap-h63xx.git] / include / asm-x86 / dmi.h

diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h
index 4edf7514a75033d8173428e1ce1640995a87f154..1cff6fe81fa5cb9d4f20954fca9e192cd99419a9 100644 (file)
--- a/include/asm-x86/dmi.h
+++ b/include/asm-x86/dmi.h
@@ -1,14 +1,8 @@
-#ifndef _ASM_X86_DMI_H
-#define _ASM_X86_DMI_H
+#ifndef ASM_X86__DMI_H
+#define ASM_X86__DMI_H
 
 #include <asm/io.h>
 
-#ifdef CONFIG_X86_32
-
-#define dmi_alloc alloc_bootmem
-
-#else /* CONFIG_X86_32 */
-
 #define DMI_MAX_DATA 2048
 
 extern int dmi_alloc_index;
@@ -25,10 +19,8 @@ static inline void *dmi_alloc(unsigned len)
        return dmi_alloc_data + idx;
 }
 
-#endif
-
 /* Use early IO mappings for DMI because it's initialized early */
 #define dmi_ioremap early_ioremap
 #define dmi_iounmap early_iounmap
 
-#endif
+#endif /* ASM_X86__DMI_H */