Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91207
b: refs/heads/master
c: b488a5e
h: refs/heads/master
i:
  91205: 9b39149
  91203: 7981e85
  91199: 8e6c4e5
v: v3
  • Loading branch information
Nicolas Pitre authored and Russell King committed Apr 10, 2008
1 parent 5ca5e12 commit 1ad0c73
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bee036b503214dd65f62af6599d2bebdf156467c
refs/heads/master: b488a5ed12c0d8417884d8c33fc0a1701a16c951
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-orion5x/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/plat-orion/pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 1ad0c73

Please sign in to comment.