aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/proto.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-12 07:30:05 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-12 07:30:05 +0200
commit1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch)
tree7211f558d841cb40e1015d0b7527643ad55cb8e7 /include/asm-x86/proto.h
parenta26929fb489188ff959b1715ee67f0c9f84405b5 (diff)
parentae94b8075a2ed58d2318ef03827b25bc844f844e (diff)
downloadkernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.zip
kernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.gz
kernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.bz2
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'include/asm-x86/proto.h')
-rw-r--r--include/asm-x86/proto.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 6c8b41b..3dd458c 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -14,8 +14,6 @@ extern void ia32_syscall(void);
extern void ia32_cstar_target(void);
extern void ia32_sysenter_target(void);
-extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
-
extern void syscall32_cpu_init(void);
extern void check_efer(void);