From 6dbd3085c3c3a53dfa4491ebcbf7847955b16f26 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 26 Jul 2011 11:24:56 +0200 Subject: [PATCH] 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 --- arch/microblaze/pci/pci_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) hose->global_number); return; } - bus->dev.of_node = of_node_get(node); + bus.dev->of_node = of_node_get(node); bus->secondary = hose->first_busno; hose->bus = bus;