Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / drivers / ssb / main.c

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 5d1e9a0..cde5ff7 100644 (file)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -762,15 +762,14 @@ EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
 
 #ifdef CONFIG_SSB_HOST_SOC
-int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,
-                           ssb_invariants_func_t get_invariants)
+int ssb_bus_host_soc_register(struct ssb_bus *bus, unsigned long baseaddr)
 {
        int err;
 
        bus->bustype = SSB_BUSTYPE_SSB;
        bus->ops = &ssb_host_soc_ops;
 
-       err = ssb_bus_register(bus, get_invariants, baseaddr);
+       err = ssb_bus_register(bus, ssb_host_soc_get_invariants, baseaddr);
        if (!err) {
                ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",
                         baseaddr);