diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
| commit | 1b7f6a626f0ff511c3840678466cbfe1d62c0b29 (patch) | |
| tree | 415e8c838c0067bff384afb8a2c91e5f7c6d11d3 /arch/powerpc/sysdev/qe_lib/ucc.c | |
| parent | b3edc9cec07ade41aaf1804f7c9e876afa90c862 (diff) | |
| parent | 3f5a6ca31c334011fd929501a078424c0d3f71be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib/ucc.c')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/ucc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c index 916c9e5df57f..ac12a44d516f 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc.c +++ b/arch/powerpc/sysdev/qe_lib/ucc.c | |||
| @@ -207,6 +207,7 @@ int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode) | |||
| 207 | case QE_CLK18: source = 8; break; | 207 | case QE_CLK18: source = 8; break; |
| 208 | case QE_CLK7: source = 9; break; | 208 | case QE_CLK7: source = 9; break; |
| 209 | case QE_CLK8: source = 10; break; | 209 | case QE_CLK8: source = 10; break; |
| 210 | case QE_CLK16: source = 11; break; | ||
| 210 | default: source = -1; break; | 211 | default: source = -1; break; |
| 211 | } | 212 | } |
| 212 | break; | 213 | break; |
| @@ -222,6 +223,7 @@ int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode) | |||
| 222 | case QE_CLK22: source = 8; break; | 223 | case QE_CLK22: source = 8; break; |
| 223 | case QE_CLK7: source = 9; break; | 224 | case QE_CLK7: source = 9; break; |
| 224 | case QE_CLK8: source = 10; break; | 225 | case QE_CLK8: source = 10; break; |
| 226 | case QE_CLK16: source = 11; break; | ||
| 225 | default: source = -1; break; | 227 | default: source = -1; break; |
| 226 | } | 228 | } |
| 227 | break; | 229 | break; |