Re: 2.6.14-mm1: drivers/pci/hotplug/: namespace clashes

[Adrian Bunk <bunk@stusta.de>]

On Mon, Nov 07, 2005 at 10:41:50AM -0800, Rajesh Shah wrote:
> On Mon, Nov 07, 2005 at 06:37:32PM +0100, Adrian Bunk wrote:
> > <--  snip  -->
> > 
> > ...
> >   LD      drivers/pci/hotplug/built-in.o
> > drivers/pci/hotplug/shpchp.o: In function `get_hp_hw_control_from_firmware':
> > : multiple definition of `get_hp_hw_control_from_firmware'
> > drivers/pci/hotplug/pciehp.o:: first defined here
> > ld: Warning: size of symbol `get_hp_hw_control_from_firmware' changed from 472 in drivers/pci/hotplug/pciehp.o to 25 in drivers/pci/hotplug/shpchp.o
> > drivers/pci/hotplug/shpchp.o: In function `get_hp_params_from_firmware':
> > : multiple definition of `get_hp_params_from_firmware'
> > drivers/pci/hotplug/pciehp.o:: first defined here
> > make[3]: *** [drivers/pci/hotplug/built-in.o] Error 1
> > 
> This patch should fix this:
>...


Nearly, the following is additionally required:


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.14-mm1-full/drivers/pci/hotplug/pciehp_hpc.c.old	2005-11-07 20:06:01.000000000 +0100
+++ linux-2.6.14-mm1-full/drivers/pci/hotplug/pciehp_hpc.c	2005-11-07 20:06:47.000000000 +0100
@@ -1418,7 +1418,7 @@
 		dbg("Bypassing BIOS check for pciehp use on %s\n",
 				pci_name(ctrl->pci_dev));
 	} else {
-		rc = get_hp_hw_control_from_firmware(ctrl->pci_dev);
+		rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
 		if (rc)
 			goto abort_free_ctlr;
 	}