git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
setup.h
diff --git
a/arch/x86/include/asm/setup.h
b/arch/x86/include/asm/setup.h
index
647d8a0
..
9756551
100644
(file)
--- 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);