patch-2.3.40 linux/drivers/pnp/quirks.c

Next file: linux/drivers/sbus/char/envctrl.c
Previous file: linux/drivers/pnp/isapnp_proc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/drivers/pnp/quirks.c linux/drivers/pnp/quirks.c
@@ -16,6 +16,8 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/isapnp.h>
+#include <linux/string.h>
+
 
 static void __init quirk_awe32_resources(struct pci_dev *dev)
 {
@@ -55,6 +57,10 @@
 static struct isapnp_fixup isapnp_fixups[] __initdata = {
 	{ ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0021),
 		quirk_awe32_resources },
+	{ ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0022),
+		quirk_awe32_resources },
+	{ ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0023),
+		quirk_awe32_resources },
 	{ 0 }
 };
 
@@ -65,8 +71,8 @@
 	while (isapnp_fixups[i].vendor != 0) {
 		if ((isapnp_fixups[i].vendor == dev->vendor) &&
 		    (isapnp_fixups[i].device == dev->device)) {
-			printk(KERN_DEBUG "PnP: Calling quirk for %s\n",
-			       dev->slot_name);
+			printk(KERN_DEBUG "PnP: Calling quirk for %02x:%02x\n",
+			       dev->bus->number, dev->devfn);
 			isapnp_fixups[i].quirk_function(dev);
 		}
 		i++;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)