diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 18:08:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 18:08:06 -0700 |
| commit | 08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86 (patch) | |
| tree | 0d087f009b80bdf54f22fdb78437af790c1afc27 /arch/x86/include/asm/setup.h | |
| parent | 13588209aa90d9c8e502750fc86160314555612f (diff) | |
| parent | 5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb (diff) | |
| download | linux-08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86.tar.bz2 | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Introduce pci_map_biosrom()
x86, olpc: Use device tree for platform identification
Diffstat (limited to 'arch/x86/include/asm/setup.h')
| -rw-r--r-- | arch/x86/include/asm/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 647d8a06ce4f..9756551ec760 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -104,10 +104,10 @@ void *extend_brk(size_t size, size_t align); type *name; \ RESERVE_BRK(name, sizeof(type) * entries) +extern void probe_roms(void); #ifdef __i386__ void __init i386_start_kernel(void); -extern void probe_roms(void); #else void __init x86_64_start_kernel(char *real_mode); |