projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma...
[profile/ivi/kernel-x86-ivi.git]
/
arch
/
arm
/
mach-kirkwood
/
common.c
diff --git
a/arch/arm/mach-kirkwood/common.c
b/arch/arm/mach-kirkwood/common.c
index
d748f50
..
1201191
100644
(file)
--- a/
arch/arm/mach-kirkwood/common.c
+++ b/
arch/arm/mach-kirkwood/common.c
@@
-301,7
+301,7
@@
void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
{
orion_ge00_init(eth_data,
GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
{
orion_ge00_init(eth_data,
GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
- IRQ_KIRKWOOD_GE00_ERR);
+ IRQ_KIRKWOOD_GE00_ERR
, 1600
);
/* The interface forgets the MAC address assigned by u-boot if
the clock is turned off, so claim the clk now. */
clk_prepare_enable(ge0);
/* The interface forgets the MAC address assigned by u-boot if
the clock is turned off, so claim the clk now. */
clk_prepare_enable(ge0);
@@
-315,7
+315,7
@@
void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
{
orion_ge01_init(eth_data,
GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
{
orion_ge01_init(eth_data,
GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
- IRQ_KIRKWOOD_GE01_ERR);
+ IRQ_KIRKWOOD_GE01_ERR
, 1600
);
clk_prepare_enable(ge1);
}
clk_prepare_enable(ge1);
}