diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
| commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
| tree | c6015f399aac7f0566dfadb984d843fe67175329 /arch/ia64/mm/init.c | |
| parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
| parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
| download | linux-fc228a04a4c01bbb2f898e180a14f9a976001f79.tar.bz2 | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 1281c609ee98..98246acd4991 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -593,7 +593,7 @@ mem_init (void) platform_dma_init(); #endif -#ifndef CONFIG_DISCONTIGMEM +#ifdef CONFIG_FLATMEM if (!mem_map) BUG(); max_mapnr = max_low_pfn; |