diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-07-26 05:24:56 -0400 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-07-26 05:29:54 -0400 |
| commit | 6dbd3085c3c3a53dfa4491ebcbf7847955b16f26 (patch) | |
| tree | 4e9c522e867ded37b9e51043fcc4c89b27227b2f /arch/microblaze | |
| parent | c9d761b7c4b658a937a941aea2781f511a0ff3ec (diff) | |
Revert "microblaze: PCI fix typo fault in of_node pointer moving into pci_bus"
This reverts commit c9d761b7c4b658a937a941aea2781f511a0ff3ec.
Ben' commit "microblaze/pci: Move the remains of pci_32.c to pci-common.c"
(sha1: bf13a6fa09b8db7f1fd59b5e2ed3674a89a6a25c)
completely removed pci_32.c that's why my fixing commit caused
the problem with merging and need to be revert.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/pci/pci_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/pci/pci_32.c b/arch/microblaze/pci/pci_32.c index 9fafb0dd9c2a..92728a6cfd80 100644 --- a/arch/microblaze/pci/pci_32.c +++ b/arch/microblaze/pci/pci_32.c | |||
| @@ -332,7 +332,7 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose) | |||
| 332 | hose->global_number); | 332 | hose->global_number); |
| 333 | return; | 333 | return; |
| 334 | } | 334 | } |
| 335 | bus->dev.of_node = of_node_get(node); | 335 | bus.dev->of_node = of_node_get(node); |
| 336 | bus->secondary = hose->first_busno; | 336 | bus->secondary = hose->first_busno; |
| 337 | hose->bus = bus; | 337 | hose->bus = bus; |
| 338 | 338 | ||