diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-07 11:15:07 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-07 11:15:07 +1100 |
| commit | fa6428ebfa2197841902b89cbc25334707e2f6eb (patch) | |
| tree | d139b822bc5447198528defb29f0c0e90d89651c /arch/powerpc/sysdev | |
| parent | c9b59da130b4430910e02a80816f317534cd5e53 (diff) | |
| parent | 3d5fa877bdf65451c78c3b3d581355deea403b80 (diff) | |
| download | op-kernel-dev-fa6428ebfa2197841902b89cbc25334707e2f6eb.zip op-kernel-dev-fa6428ebfa2197841902b89cbc25334707e2f6eb.tar.gz | |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_pci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 5da8a44..9f6f73d 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c @@ -276,9 +276,16 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np) const int *bus_range; int primary = 0; + /* Check if device is enabled */ + if (!of_device_is_available(np)) { + printk(KERN_INFO "%s: Port disabled via device-tree\n", + np->full_name); + return; + } + /* Fetch config space registers address */ if (of_address_to_resource(np, 0, &rsrc_cfg)) { - printk(KERN_ERR "%s:Can't get PCI config register base !", + printk(KERN_ERR "%s: Can't get PCI config register base !", np->full_name); return; } |
