diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-18 12:09:37 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-18 12:09:37 +1000 |
| commit | 8f3dda75cb942acc049adb2c95a6e5f4c3a8a410 (patch) | |
| tree | d06bac878499d41f33c7937bfe16391d6a833a8f /arch/powerpc/sysdev | |
| parent | a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077 (diff) | |
| parent | e5462d16f76ad7a9156a82a97fbafba298da9ca6 (diff) | |
| download | kernel_samsung_tuna-8f3dda75cb942acc049adb2c95a6e5f4c3a8a410.zip kernel_samsung_tuna-8f3dda75cb942acc049adb2c95a6e5f4c3a8a410.tar.gz kernel_samsung_tuna-8f3dda75cb942acc049adb2c95a6e5f4c3a8a410.tar.bz2 | |
Merge remote branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index f8f7f28..68ca929 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -324,6 +324,11 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary) struct resource rsrc; const int *bus_range; + if (!of_device_is_available(dev)) { + pr_warning("%s: disabled\n", dev->full_name); + return -ENODEV; + } + pr_debug("Adding PCI host bridge %s\n", dev->full_name); /* Fetch host bridge registers address */ |