Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91342
b: refs/heads/master
c: 3ee08ae
h: refs/heads/master
v: v3
  • Loading branch information
David Brownell authored and Haavard Skinnemoen committed Mar 13, 2008
1 parent 3411298 commit cd0f6df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 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: 4d243f92e48a7913938f48fa9ebea5239168bb11
refs/heads/master: 3ee08aea72f44a6d176af7a97f3ad0c67bc65a44
11 changes: 4 additions & 7 deletions trunk/drivers/clocksource/tcb_clksrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,8 @@ static struct irqaction tc_irqaction = {
.handler = ch2_irq,
};

static void __init setup_clkevents(struct atmel_tc *tc,
struct clk *t0_clk, int clk32k_divisor_idx)
static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
{
struct platform_device *pdev = tc->pdev;
struct clk *t2_clk = tc->clk[2];
int irq = tc->irq[2];

Expand All @@ -205,8 +203,7 @@ static void __init setup_clkevents(struct atmel_tc *tc,

#else /* !CONFIG_GENERIC_CLOCKEVENTS */

static void __init setup_clkevents(struct atmel_tc *tc,
struct clk *t0_clk, int clk32k_divisor_idx)
static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
{
/* NOTHING */
}
Expand All @@ -220,7 +217,7 @@ static int __init tcb_clksrc_init(void)

struct platform_device *pdev;
struct atmel_tc *tc;
struct clk *t0_clk, *t1_clk;
struct clk *t0_clk;
u32 rate, divided_rate = 0;
int best_divisor_idx = -1;
int clk32k_divisor_idx = -1;
Expand Down Expand Up @@ -298,7 +295,7 @@ static int __init tcb_clksrc_init(void)
clocksource_register(&clksrc);

/* channel 2: periodic and oneshot timer support */
setup_clkevents(tc, t0_clk, clk32k_divisor_idx);
setup_clkevents(tc, clk32k_divisor_idx);

return 0;
}
Expand Down

0 comments on commit cd0f6df

Please sign in to comment.