diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /include/asm-x86/dmi.h | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'include/asm-x86/dmi.h')
| -rw-r--r-- | include/asm-x86/dmi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 1241e6ad1935..4edf7514a750 100644 --- a/include/asm-x86/dmi.h +++ b/include/asm-x86/dmi.h | |||
| @@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned len) | |||
| 27 | 27 | ||
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | /* Use early IO mappings for DMI because it's initialized early */ | ||
| 30 | #define dmi_ioremap early_ioremap | 31 | #define dmi_ioremap early_ioremap |
| 31 | #define dmi_iounmap early_iounmap | 32 | #define dmi_iounmap early_iounmap |
| 32 | 33 | ||