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

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c
index b956fd71c131..d231cbd5c526 100644
--- a/arch/sparc/kernel/visemul.c
+++ b/arch/sparc/kernel/visemul.c
@@ -617,7 +617,7 @@ static void pmul(struct pt_regs *regs, unsigned int insn, unsigned int opf)
                 rs2 = fps_regval(f, RS2(insn));
 
                 rd_val = 0;
-                src2 = (rs2 >> (opf == FMUL8x16AU_OPF) ? 16 : 0);
+                src2 = rs2 >> (opf == FMUL8x16AU_OPF ? 16 : 0);
                 for (byte = 0; byte < 4; byte++) {
                         u16 src1 = (rs1 >> (byte * 8)) & 0x00ff;
                         u32 prod = src1 * src2;