Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

diff --combined arch/ppc/syslib/m8xx_setup.c
index 19749e9bcf91f3f3e382455b7d8a6648d3d2dc42,dcd08d4a7f1d000bf0081d278f9ae921832e2746..18da720fc1b0efca76b36f883012d99a26e753d5
--- 1/arch/ppc/syslib/m8xx_setup.c
--- 2/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@@ -87,6 -87,8 +87,6 @@@ void m8xx_calibrate_decr(void)
  
  unsigned char __res[sizeof(bd_t)];
  
 -extern void m8xx_ide_init(void);
 -
  extern unsigned long find_available_memory(void);
  extern void m8xx_cpm_reset(void);
  extern void m8xx_wdt_handler_install(bd_t *bp);
@@@ -139,16 -141,6 +139,6 @@@ m8xx_setup_arch(void
                }
        }
  #endif
- #endif
- 
- #if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS)
- #if defined(CONFIG_MTD_PHYSMAP)
-        physmap_configure(binfo->bi_flashstart, binfo->bi_flashsize,
-                                                MPC8xxADS_BANK_WIDTH, NULL);
- #ifdef CONFIG_MTD_PARTITIONS
-        physmap_set_partitions(mpc8xxads_partitions, mpc8xxads_part_num);
- #endif /* CONFIG_MTD_PARTITIONS */
- #endif /* CONFIG_MTD_PHYSMAP */
  #endif
  
        board_init();
@@@ -472,4 -464,8 +462,4 @@@ platform_init(unsigned long r3, unsigne
  
        ppc_md.find_end_of_memory       = m8xx_find_end_of_memory;
        ppc_md.setup_io_mappings        = m8xx_map_io;
 -
 -#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)
 -      m8xx_ide_init();
 -#endif
  }