diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 14:30:59 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 14:30:59 -1000 |
| commit | 968e75fc13b6d582f42ce44172e13ba58157e11f (patch) | |
| tree | 306eacdf2815f8a49b47228c3b50e7a6083ef7d4 /arch/m68k/mm | |
| parent | a00ed25cce6fe856388f89c7cd40da0eee7666a6 (diff) | |
| parent | d3690f8b713f9710e68214ca38fb8b07b587a2a7 (diff) | |
| download | linux-stable-968e75fc13b6d582f42ce44172e13ba58157e11f.tar.gz linux-stable-968e75fc13b6d582f42ce44172e13ba58157e11f.tar.bz2 linux-stable-968e75fc13b6d582f42ce44172e13ba58157e11f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/math-emu: Remove unnecessary code
m68k/math-emu: Remove commented out old code
m68k: Kill warning in setup_arch() when compiling for Sun3
m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
sparc: iounmap() and *_free_coherent() - Use lookup_resource()
m68k/atari: Reserve some ST-RAM early on for device buffer use
m68k/amiga: Chip RAM - Use lookup_resource()
resources: Add lookup_resource()
sparc: _sparc_find_resource() should check for exact matches
m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR
m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error
m68k/amiga: Chip RAM - Change chipavail to an atomic_t
m68k/amiga: Chip RAM - Always allocate from the start of memory
m68k/amiga: Chip RAM - Convert from printk() to pr_*()
m68k/amiga: Chip RAM - Use tabs for indentation
Diffstat (limited to 'arch/m68k/mm')
| -rw-r--r-- | arch/m68k/mm/init_mm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c index 9113c2f17607..bbe525434ccb 100644 --- a/arch/m68k/mm/init_mm.c +++ b/arch/m68k/mm/init_mm.c @@ -83,11 +83,6 @@ void __init mem_init(void) int initpages = 0; int i; -#ifdef CONFIG_ATARI - if (MACH_IS_ATARI) - atari_stram_mem_init_hook(); -#endif - /* this will put all memory onto the freelists */ totalram_pages = num_physpages = 0; for_each_online_pgdat(pgdat) { |