diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
| commit | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (patch) | |
| tree | 525271129ff9c692defdd20566f1f7203b18ff24 /arch/ia64/mm/init.c | |
| parent | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (diff) | |
| parent | 0e1f60609258e18ec0a0477c646101212822d387 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/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) | |||
| 593 | platform_dma_init(); | 593 | platform_dma_init(); |
| 594 | #endif | 594 | #endif |
| 595 | 595 | ||
| 596 | #ifndef CONFIG_DISCONTIGMEM | 596 | #ifdef CONFIG_FLATMEM |
| 597 | if (!mem_map) | 597 | if (!mem_map) |
| 598 | BUG(); | 598 | BUG(); |
| 599 | max_mapnr = max_low_pfn; | 599 | max_mapnr = max_low_pfn; |