Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / qe_lib / ucc.c

diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index 916c9e5df57faa67afb71b0d7d90220929b639dd..ac12a44d516f6ceb6d987ec4f09d7c85a67ee77a 100644 (file)
--- 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)
                case QE_CLK18:  source = 8; break;
                case QE_CLK7:   source = 9; break;
                case QE_CLK8:   source = 10; break;
+               case QE_CLK16:  source = 11; break;
                default:        source = -1; break;
                }
                break;
@@ -222,6 +223,7 @@ int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode)
                case QE_CLK22:  source = 8; break;
                case QE_CLK7:   source = 9; break;
                case QE_CLK8:   source = 10; break;
+               case QE_CLK16:  source = 11; break;
                default:        source = -1; break;
                }
                break;