diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /arch/ppc/syslib/m8xx_setup.c | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
| download | op-kernel-dev-e3ee3b78f83688a0ae4315e8be71b2eac559904a.zip op-kernel-dev-e3ee3b78f83688a0ae4315e8be71b2eac559904a.tar.gz | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'arch/ppc/syslib/m8xx_setup.c')
| -rw-r--r-- | arch/ppc/syslib/m8xx_setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 55a381a..4c888da 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(); +extern void m8xx_cpm_reset(void); extern void m8xx_wdt_handler_install(bd_t *bp); extern void rpxfb_alloc_pages(void); extern void cpm_interrupt_init(void); @@ -266,8 +266,8 @@ m8xx_show_percpuinfo(struct seq_file *m, int i) bp = (bd_t *)__res; - seq_printf(m, "clock\t\t: %ldMHz\n" - "bus clock\t: %ldMHz\n", + seq_printf(m, "clock\t\t: %uMHz\n" + "bus clock\t: %uMHz\n", bp->bi_intfreq / 1000000, bp->bi_busfreq / 1000000); @@ -423,7 +423,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, ppc_md.find_end_of_memory = m8xx_find_end_of_memory; ppc_md.setup_io_mappings = m8xx_map_io; -#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) +#if defined(CONFIG_BLK_DEV_MPC8xx_IDE) m8xx_ide_init(); #endif } |
