diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /include/asm-x86/bios_ebda.h | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/bios_ebda.h')
| -rw-r--r-- | include/asm-x86/bios_ebda.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/bios_ebda.h b/include/asm-x86/bios_ebda.h index b4a46b7be794..0033e50c13b2 100644 --- a/include/asm-x86/bios_ebda.h +++ b/include/asm-x86/bios_ebda.h | |||
| @@ -14,4 +14,6 @@ static inline unsigned int get_bios_ebda(void) | |||
| 14 | return address; /* 0 means none */ | 14 | return address; /* 0 means none */ |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | void reserve_ebda_region(void); | ||
| 18 | |||
| 17 | #endif /* _MACH_BIOS_EBDA_H */ | 19 | #endif /* _MACH_BIOS_EBDA_H */ |