diff -Nru linux/drivers/gsc/dino.c linux.new/drivers/gsc/dino.c
--- linux/drivers/gsc/dino.c	Tue Jun 12 14:49:42 2001
+++ linux.new/drivers/gsc/dino.c	Tue Jun 12 14:49:59 2001
@@ -66,6 +66,7 @@
 #include <asm/irq.h>		/* for "gsc" irq functions */
 #include <asm/gsc.h>
 
+#include "busdevice.h"
 
 #undef DINO_DEBUG
 
@@ -542,6 +543,21 @@
 	}
 }
 
+static int
+dino_find_irq(struct busdevice *dino_dev, struct hp_device *dev)
+{	
+	int irq;
+	int off = ((int) dev->hpa) & 0xffff;
+
+	switch (off) {
+	case 0x1000:	irq = 8;  break; /* PS/2 Keyboard and Mouse */
+	case 0x3000:	irq = 10; break; /* RS232 */
+	default:        irq = -1; break; /* unknown */
+	}
+
+	return irq;
+}
+
 static void __init
 dino_bios_init(void)
 {
@@ -804,18 +820,33 @@
 }
 
 static int __init
-dino_common_init(struct dino_device *dino_dev)
+dino_common_init(struct hp_device *d, struct dino_device *dino_dev)
 {
 	int status;
 	u32 eim;
 	struct gsc_irq gsc_irq;
 	struct resource *res;
 
+	struct busdevice *dino_busdevice;
+	int ret;
+
 	pcibios_register_hba((struct pci_hba_data *) dino_dev);
 
 	pci_bios = &dino_bios_ops;   /* used by pci_scan_bus() */
 	pci_port = &dino_port_ops;
 
+
+        /* Needed for the serial port to work. */
+
+	dino_busdevice = kmalloc(sizeof(struct busdevice), GFP_KERNEL);
+	if(!dino_busdevice)
+		return -ENOMEM;
+	
+	dino_busdevice->name = "Dino";
+	dino_busdevice->hpa = d->hpa;
+	dino_busdevice->find_irq = dino_find_irq;
+	
+
 	/*
 	** Note: SMP systems can make use of IRR1/IAR1 registers
 	**   But it won't buy much performance except in very
@@ -859,6 +890,21 @@
 		return(1);
 	}
 
+	/* Register busdevice for the serial port */
+
+	dino_busdevice->parent_irq = gsc_irq.irq;
+	dino_busdevice->eim = ((u32) gsc_irq.txn_addr) | gsc_irq.txn_data;
+
+	ret = register_busdevice(d,dino_busdevice);
+	if (ret) {
+	kfree(dino_busdevice);
+	return ret;
+	}
+
+	kfree(dino_busdevice->busdev_region);
+	dino_busdevice->busdev_region = dino_dev->dino_region;
+	
+
 	/*
 	** This enables DINO to generate interrupts when it sees
 	** any of it's inputs *change*. Just asserting an IRQ
@@ -945,7 +991,7 @@
 		dino_bridge_init(dino_dev);
 	}
 
-	if (dino_common_init(dino_dev))
+	if (dino_common_init(d,dino_dev))
 		return(1);
 
 	/*
 
 
diff -Nru linux/drivers/gsc/serial.c linux.new/drivers/gsc/serial.c
--- linux/drivers/gsc/serial.c	Tue Jun 12 14:49:32 2001
+++ linux.new/drivers/gsc/serial.c	Tue Jun 12 14:50:06 2001
@@ -35,6 +35,7 @@
 
 #include "busdevice.h"
 
+
 static int serial_line_nr;
 
 static int __init 
@@ -87,9 +89,12 @@
 	return 0;
 }
 
-
-static struct pa_iodc_driver serial_drivers_for[] = {
-  {HPHW_FIO, 0x05F, 0x0, 0x00081, 0x0, 0,		/* A-class 180 */
+static struct pa_iodc_driver serial_drivers_for[] = {  
+   {HPHW_FIO, 0x022, 0x0, 0x0008C, 0x0, 0,		/* B-Class 132 & 180 */
+	DRIVER_CHECK_HVERSION + DRIVER_CHECK_HVERSION_REV + 
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"serial device", "B Class", serial_init_chip},
+   {HPHW_FIO, 0x05F, 0x0, 0x00081, 0x0, 0,		/* A-class 180 */
 	DRIVER_CHECK_HVERSION + DRIVER_CHECK_HVERSION_REV + 
 	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
 	"serial device", "unknown", serial_init_chip},