D3305.id7660.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3305.id7660.diff
View Options

	Index: sys/powerpc/mpc85xx/mpc85xx.h
	===================================================================
	--- sys/powerpc/mpc85xx/mpc85xx.h
	+++ sys/powerpc/mpc85xx/mpc85xx.h
	@@ -30,6 +30,8 @@
	#ifndef _MPC85XX_H_
	#define _MPC85XX_H_

	+#include <machine/platformvar.h>
	+
	/*
	* Configuration control and status registers
	*/
	@@ -84,4 +86,7 @@
	int law_getmax(void);
	int law_pci_target(struct resource , int , int *);

	+DECLARE_CLASS(mpc85xx_platform);
	+int mpc85xx_attach(platform_t);
	+
	#endif /* _MPC85XX_H_ */
	Index: sys/powerpc/mpc85xx/platform_mpc85xx.c
	===================================================================
	--- sys/powerpc/mpc85xx/platform_mpc85xx.c
	+++ sys/powerpc/mpc85xx/platform_mpc85xx.c
	@@ -71,7 +71,6 @@
	static int cpu, maxcpu;

	static int mpc85xx_probe(platform_t);
	-static int mpc85xx_attach(platform_t);
	static void mpc85xx_mem_regions(platform_t, struct mem_region *phys,
	int physsz, struct mem_region avail, int *availsz);
	static u_long mpc85xx_timebase_freq(platform_t, struct cpuref *cpuref);
	@@ -98,11 +97,7 @@
	PLATFORMMETHOD_END
	};

	-static platform_def_t mpc85xx_platform = {
	- "mpc85xx",
	- mpc85xx_methods,
	- 0
	-};
	+DEFINE_CLASS_0(mpc85xx, mpc85xx_platform, mpc85xx_methods, 0);

	PLATFORM_DEF(mpc85xx_platform);

	@@ -117,7 +112,7 @@
	return (ENXIO);
	}

	-static int
	+int
	mpc85xx_attach(platform_t plat)
	{
	phandle_t cpus, child, ccsr;