diff options
| author | Paul Mackerras | 2008-04-14 13:11:02 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2008-04-14 13:11:02 +0200 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/powerpc/sysdev/cpm2.c | |
| parent | [POWERPC] Remove CONFIG_PCI_LEGACY from some configs (diff) | |
| parent | Linux 2.6.25-rc9 (diff) | |
| download | kernel-qcow2-linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.gz kernel-qcow2-linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.xz kernel-qcow2-linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/sysdev/cpm2.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c index 803b59cc047b..fa70ee31349e 100644 --- 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; |