diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /arch/powerpc/sysdev | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/sysdev')
| -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 7be711232124..dd066bb1d562 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) | |||
| 240 | case CPM_CLK_SCC1: | 240 | case CPM_CLK_SCC1: |
| 241 | reg = &im_cpmux->cmx_scr; | 241 | reg = &im_cpmux->cmx_scr; |
| 242 | shift = 24; | 242 | shift = 24; |
| 243 | break; | ||
| 243 | case CPM_CLK_SCC2: | 244 | case CPM_CLK_SCC2: |
| 244 | reg = &im_cpmux->cmx_scr; | 245 | reg = &im_cpmux->cmx_scr; |
| 245 | shift = 16; | 246 | shift = 16; |