Merge branch 'linux-2.6' into for-linus

4 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 812c87c73b..e3d71e083f 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -122,8 +122,7 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input)
                                 mcn_shift = QE_CR_MCN_NORMAL_SHIFT;
                 }
 
-                out_be32(&qe_immr->cp.cecdr,
-                         immrbar_virt_to_phys((void *)cmd_input));
+                out_be32(&qe_immr->cp.cecdr, cmd_input);
                 out_be32(&qe_immr->cp.cecr,
                          (cmd | QE_CR_FLG | ((u32) device << dev_shift) | (u32)
                           mcn_protocol << mcn_shift));
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index 916c9e5df5..ac12a44d51 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)
                 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;
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index c2be7348fc..75fa3104a4 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -163,7 +163,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
 
         /* check if the UCC port number is in range. */
         if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
-                uccf_err("ucc_fast_init: Illagal UCC number!");
+                uccf_err("ucc_fast_init: Illegal UCC number!");
                 return -EINVAL;
         }
 
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
index 1fb88ef7cf..a49da6b73e 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -152,7 +152,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
 
         /* check if the UCC port number is in range. */
         if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
-                uccs_err("ucc_slow_init: Illagal UCC number!");
+                uccs_err("ucc_slow_init: Illegal UCC number!");
                 return -EINVAL;
         }