diff --git a/[refs] b/[refs] index 8f5b8bf2d4ac..0489c36aedfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bee036b503214dd65f62af6599d2bebdf156467c +refs/heads/master: b488a5ed12c0d8417884d8c33fc0a1701a16c951 diff --git a/trunk/arch/arm/mach-orion5x/pci.c b/trunk/arch/arm/mach-orion5x/pci.c index 27b4afc8f486..fdf99fca85b3 100644 --- a/trunk/arch/arm/mach-orion5x/pci.c +++ b/trunk/arch/arm/mach-orion5x/pci.c @@ -41,7 +41,7 @@ void __init orion5x_pcie_id(u32 *dev, u32 *rev) *rev = orion_pcie_rev(PCIE_BASE); } -int orion5x_pcie_local_bus_nr(void) +int __init orion5x_pcie_local_bus_nr(void) { return orion_pcie_get_local_bus_nr(PCIE_BASE); } diff --git a/trunk/arch/arm/plat-orion/pcie.c b/trunk/arch/arm/plat-orion/pcie.c index f01966a330ee..abfda53f1800 100644 --- a/trunk/arch/arm/plat-orion/pcie.c +++ b/trunk/arch/arm/plat-orion/pcie.c @@ -57,12 +57,12 @@ u32 __init orion_pcie_rev(void __iomem *base) return readl(base + PCIE_DEV_REV_OFF) & 0xff; } -int __init orion_pcie_link_up(void __iomem *base) +int orion_pcie_link_up(void __iomem *base) { return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN); } -int __init orion_pcie_get_local_bus_nr(void __iomem *base) +int orion_pcie_get_local_bus_nr(void __iomem *base) { u32 stat = readl(base + PCIE_STAT_OFF);