diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
| commit | 41bd03ba0758a076671e5de35ed084535984143d (patch) | |
| tree | 9a669f9f1f52996b38acb077655e4b044bba67c7 /arch/microblaze/pci | |
| parent | 090830b4c79cd5ac85430822a9b87c90848bedcf (diff) | |
| parent | dc75925d67950889b79df1cc1518c21ec678df6c (diff) | |
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'arch/microblaze/pci')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 9cb782b8e036..23be25fec4d6 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
| @@ -1277,6 +1277,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) | |||
| 1277 | printk(KERN_WARNING "PCI: Cannot allocate resource region " | 1277 | printk(KERN_WARNING "PCI: Cannot allocate resource region " |
| 1278 | "%d of PCI bridge %d, will remap\n", i, bus->number); | 1278 | "%d of PCI bridge %d, will remap\n", i, bus->number); |
| 1279 | clear_resource: | 1279 | clear_resource: |
| 1280 | res->start = res->end = 0; | ||
| 1280 | res->flags = 0; | 1281 | res->flags = 0; |
| 1281 | } | 1282 | } |
| 1282 | 1283 | ||