Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112373
b: refs/heads/master
c: 2b12797
h: refs/heads/master
i:
  112371: e76d3b6
v: v3
  • Loading branch information
Eric Miao authored and Russell King committed Sep 25, 2008
1 parent ba82340 commit ca2a0a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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: 2276f03b745c297733e41470dde7f32bdd4b52af
refs/heads/master: 2b12797c59d60379858050255046dacfbee68a8b
10 changes: 4 additions & 6 deletions trunk/arch/arm/mach-pxa/pxa25x.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,6 @@ static int __init pxa25x_init(void)
{
int i, ret = 0;

/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
if (cpu_is_pxa255())
clks_register(&pxa25x_hwuart_clk, 1);

if (cpu_is_pxa21x() || cpu_is_pxa25x()) {

reset_status = RCSR;
Expand All @@ -375,9 +371,11 @@ static int __init pxa25x_init(void)
return ret;
}

/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
if (cpu_is_pxa255())
/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
if (cpu_is_pxa255()) {
clks_register(&pxa25x_hwuart_clk, 1);
ret = platform_device_register(&pxa_device_hwuart);
}

return ret;
}
Expand Down

0 comments on commit ca2a0a3

Please sign in to comment.