From ac1ecc666cbd2af583c8788369558a8cf00af164 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Mon, 6 Oct 2008 21:08:39 +0400 Subject: [PATCH] --- yaml --- r: 114635 b: refs/heads/master c: 62666828bae7057835d982367e98716a1bd0fd40 h: refs/heads/master i: 114633: 2e46671100fdb278183cfe8a793d80994dada82e 114631: 5f4e1bf4bfd530e91a02955cb0b3d8106f39f31e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2893cc90265b..aa3830830149 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c091193e4a12e88930a0bb3ed3632c51e926a76 +refs/heads/master: 62666828bae7057835d982367e98716a1bd0fd40 diff --git a/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c index be62de23bead..8bb13c807142 100644 --- a/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c @@ -85,8 +85,14 @@ static void __init mpc837x_mds_setup_arch(void) ppc_md.progress("mpc837x_mds_setup_arch()", 0); #ifdef CONFIG_PCI - for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") + for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") { + if (!of_device_is_available(np)) { + pr_warning("%s: disabled by the firmware.\n", + np->full_name); + continue; + } mpc83xx_add_bridge(np); + } #endif mpc837xmds_usb_cfg(); }