diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 20:19:14 +0100 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /include/asm-x86/dmi.h | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'include/asm-x86/dmi.h')
| -rw-r--r-- | include/asm-x86/dmi.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 4edf7514a750..58a86571fe0f 100644 --- a/include/asm-x86/dmi.h +++ b/include/asm-x86/dmi.h @@ -3,12 +3,6 @@ #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,8 +19,6 @@ 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 |