sh: Handle PCI controller resource conflicts.

[safe/jmp/linux-2.6] / arch / sh / drivers / pci / pci-dreamcast.c

diff --git a/arch/sh/drivers/pci/pci-dreamcast.c b/arch/sh/drivers/pci/pci-dreamcast.c
index 210f9d4..bd5a1e5 100644 (file)
--- a/arch/sh/drivers/pci/pci-dreamcast.c
+++ b/arch/sh/drivers/pci/pci-dreamcast.c
@@ -95,8 +95,6 @@ static int __init gapspci_init(void)
        outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
        outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
 
-       register_pci_controller(&dreamcast_pci_controller);
-
-       return 0;
+       return register_pci_controller(&dreamcast_pci_controller);
 }
 arch_initcall(gapspci_init);