diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /include/asm-ia64/ia32.h | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'include/asm-ia64/ia32.h')
| -rw-r--r-- | include/asm-ia64/ia32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index 8e746b2413a6..f8044a1169cd 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | 13 | ||
| 14 | # ifdef CONFIG_IA32_SUPPORT | 14 | # ifdef CONFIG_IA32_SUPPORT |
| 15 | 15 | ||
| 16 | #define IA32_PAGE_OFFSET 0xc0000000 | ||
| 17 | |||
| 16 | extern void ia32_cpu_init (void); | 18 | extern void ia32_cpu_init (void); |
| 17 | extern void ia32_mem_init (void); | 19 | extern void ia32_mem_init (void); |
| 18 | extern void ia32_gdt_init (void); | 20 | extern void ia32_gdt_init (void); |