Merge branch 'linux-2.6'

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / powerpc / sysdev / cpm2.c

diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index 803b59cc047b19242009f38f6879b539018e489c..fa70ee31349eedb463b4570aa8ba6f6020f6ffb4 100644 (file)
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -240,6 +240,7 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
        case CPM_CLK_SCC1:
                reg = &im_cpmux->cmx_scr;
                shift = 24;
+               break;
        case CPM_CLK_SCC2:
                reg = &im_cpmux->cmx_scr;
                shift = 16;