Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834aba09 authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch '85xx' into for_paulus

parents 00e402d0 578f8f20

arch/powerpc/platforms/85xx/mpc8568_mds.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/console.h>

#include <linux/delay.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <linux/module.h>

#include <linux/fsl_devices.h>

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+0 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/kdev_t.h>

#include <linux/delay.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>



#include <asm/system.h>

#include <asm/time.h>
@@ -245,12 +244,6 @@ static void __init mpc85xx_ads_setup_arch(void) 
		add_bridge(np);

	ppc_md.pci_exclude_device = mpc85xx_exclude_device;

#endif



#ifdef  CONFIG_ROOT_NFS

	ROOT_DEV = Root_NFS;

#else

	ROOT_DEV = Root_HDA1;

#endif

}



static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/console.h>

#include <linux/delay.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <linux/module.h>

#include <linux/fsl_devices.h>
@@ -263,12 +262,6 @@ static void __init mpc85xx_cds_setup_arch(void) 
	ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;

	ppc_md.pci_exclude_device = mpc85xx_exclude_device;

#endif



#ifdef  CONFIG_ROOT_NFS

	ROOT_DEV = Root_NFS;

#else

	ROOT_DEV = Root_HDA1;

#endif

}



static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+0 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/kdev_t.h>

#include <linux/delay.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>



#include <asm/system.h>

#include <asm/time.h>
@@ -367,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void) 


	printk("MPC86xx HPCN board from Freescale Semiconductor\n");



#ifdef  CONFIG_ROOT_NFS

	ROOT_DEV = Root_NFS;

#else

	ROOT_DEV = Root_HDA1;

#endif



#ifdef CONFIG_SMP

	mpc86xx_smp_init();

#endif