diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /arch/powerpc/sysdev/cpm2.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
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 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; |