diff options
Diffstat (limited to 'arch/powerpc/platforms/40x/ppc40x_simple.c')
| -rw-r--r-- | arch/powerpc/platforms/40x/ppc40x_simple.c | 18 | 
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c index 546bbc229d1..8f3920e5a04 100644 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c @@ -50,24 +50,22 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);   * Again, if your board needs to do things differently then create a   * board.c file for it rather than adding it to this list.   */ -static char *board[] __initdata = { +static const char * const board[] __initconst = {  	"amcc,acadia",  	"amcc,haleakala",  	"amcc,kilauea",  	"amcc,makalu", -	"est,hotfoot" +	"apm,klondike", +	"est,hotfoot", +	"plathome,obs600", +	NULL  };  static int __init ppc40x_probe(void)  { -	unsigned long root = of_get_flat_dt_root(); -	int i = 0; - -	for (i = 0; i < ARRAY_SIZE(board); i++) { -		if (of_flat_dt_is_compatible(root, board[i])) { -			ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); -			return 1; -		} +	if (of_flat_dt_match(of_get_flat_dt_root(), board)) { +		pci_set_flags(PCI_REASSIGN_ALL_RSRC); +		return 1;  	}  	return 0;  | 
