dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus

This commit is contained in:
Paul Mundt 2012-06-28 16:46:13 +09:00
parent bc404e9128 ad3337cb38
commit e9bcd470d8
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/drivers/pci/pcie-sh7786.c
View File

@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port)
clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);
clk->enable_bit = BITS_CKE;
ret = sh_clk_mstp32_register(clk, 1);
ret = sh_clk_mstp_register(clk, 1);
if (unlikely(ret < 0))
goto err_phy;

2
arch/sh/kernel/cpu/sh4a/clock-sh7343.c
View File

@ -283,7 +283,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7366.c
View File

@ -276,7 +276,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7722.c
View File

@ -261,7 +261,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);
ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
View File

@ -311,7 +311,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);
ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7724.c
View File

@ -375,7 +375,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);
ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7734.c
View File

@ -260,7 +260,7 @@ int __init arch_clk_init(void)
&div4_table);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7757.c
View File

@ -148,7 +148,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7785.c
View File

@ -175,7 +175,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-sh7786.c
View File

@ -194,7 +194,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}

2
arch/sh/kernel/cpu/sh4a/clock-shx3.c
View File

@ -149,7 +149,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table);
if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret;
}