Re: EDD build error

[Torsten Duwe <duwe@lst.de>]

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

On Tuesday 26 June 2007, Randy Dunlap wrote:

> ERROR: "pci_get_bus_and_slot" [drivers/firmware/edd.ko] undefined!
> make[1]: *** [__modpost] Error 1
>
> Should EDD depend on PCI or should some parts of edd.c be stubbed?

I'd suggest to simply stub it, as attached (untested, as my crap-Awarded BIOS
only has 2.1). It may not be nice to pull in the PCI defs and then return NULL
regardless, but should be safe in your case. Does that work?

	Torsten


[-- Attachment #2: EDD-diff --]
[-- Type: text/x-diff, Size: 603 bytes --]

--- drivers/firmware/edd.c.orig	2007-04-26 05:08:32.000000000 +0200
+++ drivers/firmware/edd.c	2007-06-26 23:56:32.000000000 +0200
@@ -669,10 +669,14 @@
 	struct edd_info *info = edd_dev_get_info(edev);
 
 	if (edd_dev_is_type(edev, "PCI")) {
+#ifdef CONFIG_PCI
 		return pci_find_slot(info->params.interface_path.pci.bus,
 				     PCI_DEVFN(info->params.interface_path.pci.slot,
 					       info->params.interface_path.pci.
 					       function));
+#else
+		printk(KERN_WARNING "EDD referenced a PCI device for drive 0x%02x, but PCI is not configured\n", edev->index);
+#endif
 	}
 	return NULL;
 }