Merge bk://kernel.bkbits.net/davem/sparc-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/media/dvb/ttpci/av7110.c

@@ -2673,9 +2673,9 @@ static int tuner_set_tv_freq (struct saa7146_dev *dev, u32 freq)
 	buf[1] = div & 0xff;
 	buf[2] = 0x8e;
 
-	if (freq < (u32) 16*168.25 )
+	if (freq < (u32) (16*168.25) )
 		config = 0xa0;
-	else if (freq < (u32) 16*447.25)
+	else if (freq < (u32) (16*447.25) )
 		config = 0x90;
 	else
 		config = 0x30;

mm/mremap.c

@@ -316,7 +316,7 @@ unsigned long do_mremap(unsigned long addr,
 	new_len = PAGE_ALIGN(new_len);
 
 	/* Don't allow the degenerate cases */
-	if (!(old_len | new_len))
+	if (!old_len || !new_len)
 		goto out;
 
 	/* new_addr is only valid if MREMAP_FIXED is specified */