diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:13 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:13 -0800 |
| commit | 8d6339b8a532ec4eeb31db321cf1e6068965deda (patch) | |
| tree | 0fa1d7aa14d3dcc6f6ac5236ba14649fd9a0d5e6 /arch/ia64/mm/init.c | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| parent | 32974ad4907cdde6c9de612cd1b2ee0568fb9409 (diff) | |
Pull rmia32 into release branch
Diffstat (limited to 'arch/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 7c0d4814a68d..ca3335ea56cc 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -22,7 +22,6 @@ #include <linux/kexec.h> #include <asm/dma.h> -#include <asm/ia32.h> #include <asm/io.h> #include <asm/machvec.h> #include <asm/numa.h> @@ -668,10 +667,6 @@ mem_init (void) fsyscall_table[i] = sys_call_table[i] | 1; } setup_gate(); - -#ifdef CONFIG_IA32_SUPPORT - ia32_mem_init(); -#endif } #ifdef CONFIG_MEMORY_HOTPLUG |