diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
| commit | 95f193aa4fe50eb2dc987081d066edd6e13027de (patch) | |
| tree | 1bf995f6290ef824ea8571520de815379d0478a3 /arch/ppc/syslib/m8xx_setup.c | |
| parent | e872d4cace8681838e8d18d52c92f4870e980a08 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
| download | linux-95f193aa4fe50eb2dc987081d066edd6e13027de.tar.gz linux-95f193aa4fe50eb2dc987081d066edd6e13027de.tar.xz | |
Merge ../to-linus
Diffstat (limited to 'arch/ppc/syslib/m8xx_setup.c')
| -rw-r--r-- | arch/ppc/syslib/m8xx_setup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index c1db2ab1d154..55a381af4e37 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c @@ -57,7 +57,7 @@ unsigned char __res[sizeof(bd_t)]; extern void m8xx_ide_init(void); extern unsigned long find_available_memory(void); -extern void m8xx_cpm_reset(uint cpm_page); +extern void m8xx_cpm_reset(); extern void m8xx_wdt_handler_install(bd_t *bp); extern void rpxfb_alloc_pages(void); extern void cpm_interrupt_init(void); @@ -70,13 +70,9 @@ board_init(void) void __init m8xx_setup_arch(void) { - int cpm_page; - - cpm_page = (int) alloc_bootmem_pages(PAGE_SIZE); - /* Reset the Communication Processor Module. */ - m8xx_cpm_reset(cpm_page); + m8xx_cpm_reset(); #ifdef CONFIG_FB_RPX rpxfb_alloc_pages(); |