diff -urN -X cvs-exc.txt mipslinux-2.4.17-xfs/arch/mips/kernel/irq.c settop/arch/mips/kernel/irq.c
--- mipslinux-2.4.17-xfs/arch/mips/kernel/irq.c	Tue Dec 18 00:04:00 2001
+++ settop/arch/mips/kernel/irq.c	Thu Feb  7 09:05:04 2002
@@ -25,6 +25,8 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
+static void register_irq_proc (unsigned int irq);
+
 /*
  * Controller mappings for all interrupt sources:
  */
@@ -98,7 +100,7 @@
 			p += sprintf(p, ", %s", action->name);
 		*p++ = '\n';
 	}
-	p += sprintf(p, "ERR: %10lu\n", irq_err_count);
+	p += sprintf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
 	return p - buf;
 }
 
diff -urN -X cvs-exc.txt mipslinux-2.4.17-xfs/drivers/ide/ide-probe.c settop/drivers/ide/ide-probe.c
--- mipslinux-2.4.17-xfs/drivers/ide/ide-probe.c	Sun Dec  2 06:08:03 2001
+++ settop/drivers/ide/ide-probe.c	Tue Jan 29 14:06:39 2002
@@ -720,9 +720,9 @@
 
 #if !defined(__mc68000__) && !defined(CONFIG_APUS) && !defined(__sparc__)
 	printk("%s at 0x%03x-0x%03x,0x%03x on irq %d", hwif->name,
-		hwif->io_ports[IDE_DATA_OFFSET],
-		hwif->io_ports[IDE_DATA_OFFSET]+7,
-		hwif->io_ports[IDE_CONTROL_OFFSET], hwif->irq);
+		(unsigned int) hwif->io_ports[IDE_DATA_OFFSET],
+		(unsigned int) hwif->io_ports[IDE_DATA_OFFSET]+7,
+		(unsigned int) hwif->io_ports[IDE_CONTROL_OFFSET], hwif->irq);
 #elif defined(__sparc__)
 	printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %s", hwif->name,
 		hwif->io_ports[IDE_DATA_OFFSET],
diff -urN -X cvs-exc.txt mipslinux-2.4.17-xfs/drivers/pci/pci.ids settop/drivers/pci/pci.ids
--- mipslinux-2.4.17-xfs/drivers/pci/pci.ids	Sun Dec  2 05:34:45 2001
+++ settop/drivers/pci/pci.ids	Thu Feb  7 09:34:19 2002
@@ -1392,7 +1392,7 @@
 109e  Brooktree Corporation
 	0350  Bt848 TV with DMA push
 	0351  Bt849A Video capture
-	036c  Bt879(??) Video Capture
+	036c  Bt879[??] Video Capture
 		13e9 0070  Win/TV (Video Section)
 	036e  Bt878
 		0070 13eb  WinTV/GO
@@ -4656,7 +4656,7 @@
 270b  Xantel Corporation
 270f  Chaintech Computer Co. Ltd
 2711  AVID Technology Inc.
-2a15  3D Vision(???)
+2a15  3D Vision[???]
 3000  Hansol Electronics Inc.
 3142  Post Impression Systems.
 3388  Hint Corp
diff -urN -X cvs-exc.txt mipslinux-2.4.17-xfs/drivers/pci/proc.c settop/drivers/pci/proc.c
--- mipslinux-2.4.17-xfs/drivers/pci/proc.c	Sun Dec  2 05:34:45 2001
+++ settop/drivers/pci/proc.c	Wed Jan 30 08:34:03 2002
@@ -200,7 +200,7 @@
 static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
 	const struct proc_dir_entry *dp = inode->u.generic_ip;
-	struct pci_dev *dev = dp->data;
+	struct pci_dev *dev;
 #ifdef HAVE_PCI_MMAP
 	struct pci_filp_private *fpriv = file->private_data;
 #endif /* HAVE_PCI_MMAP */
@@ -208,6 +208,7 @@
 
 	switch (cmd) {
 	case PCIIOC_CONTROLLER:
+		dev = dp->data;
 		ret = pci_controller_num(dev);
 		break;