diff options
author | Nicolas Pitre <nico@cam.org> | 2008-04-09 21:08:35 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-10 15:27:09 +0100 |
commit | b488a5ed12c0d8417884d8c33fc0a1701a16c951 (patch) | |
tree | 501862c2b8429084c469ba45dc42823488fd6c14 | |
parent | bee036b503214dd65f62af6599d2bebdf156467c (diff) | |
download | op-kernel-dev-b488a5ed12c0d8417884d8c33fc0a1701a16c951.zip op-kernel-dev-b488a5ed12c0d8417884d8c33fc0a1701a16c951.tar.gz |
[ARM] 4954/1: Orion: fix some function section mismatch
Without this, lspci won't work.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-orion5x/pci.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-orion/pcie.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 27b4afc..fdf99fc 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/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/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index f01966a..abfda53 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/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); |