Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/scsi/iscsi_tcp.c
	net/ipv4/ipmr.c

1 files changed, 8 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index eb5927212fab..8dc1e24f3c23 100644
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -244,9 +244,6 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
                 return -EINVAL;
         }
 
-        if (mode == CPM_CLK_RX)
-                shift += 3;
-
         for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
                 if (clk_map[i][0] == target && clk_map[i][1] == clock) {
                         bits = clk_map[i][2];
@@ -259,6 +256,14 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
         bits <<= shift;
         mask <<= shift;
 
+        if (mode == CPM_CLK_RTX) {
+                bits |= bits << 3;
+                mask |= mask << 3;
+        } else if (mode == CPM_CLK_RX) {
+                bits <<= 3;
+                mask <<= 3;
+        }
+
         out_be32(reg, (in_be32(reg) & ~mask) | bits);
 
         cpm2_unmap(im_cpmux);