Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 168505
b: refs/heads/master
c: 6de95c1
h: refs/heads/master
i:
  168503: b1bc567
v: v3
  • Loading branch information
Li Jie authored and Nicolas Pitre committed Nov 6, 2009
1 parent 2189558 commit 2cfc045
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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: 5d8965557318fabb1680d1817c2afc2714b6d3ce
refs/heads/master: 6de95c198729d34a85c88f8844f1c3d57fb6da00
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-kirkwood/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ int __init kirkwood_find_tclk(void)
return 166666667;
}

static void kirkwood_timer_init(void)
static void __init kirkwood_timer_init(void)
{
kirkwood_tclk = kirkwood_find_tclk();
orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-kirkwood/pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static struct pci_ops pcie_ops = {
};


static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
{
struct resource *res;
extern unsigned int kirkwood_clk_ctrl;
Expand Down

0 comments on commit 2cfc045

Please sign in to comment.