diff options
| author | Zeng Zhaoming <b32542@freescale.com> | 2011-06-28 09:15:47 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:18:24 +0800 |
| commit | e9fdc59b7b9f57ac8f886779ded5a8a326f7e9e6 (patch) | |
| tree | c08e929032e804a36c3df5bdbbf1aa2acb0c2310 /arch/arm/plat-mxc/clock.c | |
| parent | 2049219609cb178c90c962ba3c8919d9d8d8b314 (diff) | |
ENGR00139229-1 MX6: Bring up i.MX6 sabreauto with Single core
MSL code for bring up MX6 sabreauto board with Single core.
Merged from testbuild:imx6_bringup branch.
Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
Singed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Richard Zhu <r65037@freescale.com>
Signed-off-by: Anish Trivedi <anish@freescale.com>
Signed-off-by: Dong Aisheng <b29396@freescale.com>
Signed-off-by: Jason Chen <b02280@freescale.com>
Signed-off-by: Lily Zhang <r58066@freescale.com>
Signed-off-by: Sammy He <r62914@freescale.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Terry Lv <r65388@freescale.com>
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
Merged-by: Zeng Zhaoming <b32542@freescale.com>
Reviewed-by: Jason Liu <r64343@freescale.com>
Reviewed-by: Frank Li <Frank.Li@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/clock.c')
| -rwxr-xr-x | arch/arm/plat-mxc/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c index bec9ad976158..1814cdc237b9 100755 --- a/arch/arm/plat-mxc/clock.c +++ b/arch/arm/plat-mxc/clock.c @@ -95,7 +95,7 @@ static int __clk_enable(struct clk *clk) */ int clk_enable(struct clk *clk) { - unsigned long flags; + /* unsigned long flags; */ int ret = 0; if (in_interrupt()) { @@ -141,7 +141,7 @@ EXPORT_SYMBOL(clk_enable); */ void clk_disable(struct clk *clk) { - unsigned long flags; + /* unsigned long flags; */ if (in_interrupt()) { printk(KERN_ERR " clk_disable cannot be called in an interrupt context\n"); |