RE: 2.6.17-mm2 -- drivers/built-in.o: In function `is_pci_dock_device':acpiphp_glue.c:(.text+0x12364): undefined reference to `is_dock_device'

[Brown, Len]

>It would be a solution to let HOTPLUG_PCI_ACPI depend on
>(ACPI_DOCK || ACPI_DOCK=n), or the #if in 
>include/acpi/acpi_drivers.h could be changed to
>#if defined(CONFIG_ACPI_DOCK) || 
>(defined(CONFIG_ACPI_DOCK_MODULE) && defined(MODULE))

CONFIG_HOTPLUG_PCI_ACPI requires CONFIG_ACPI_DOCK.
There are 9 combinations.

DOCK	HPA
n	n	ok
n	y	illegal
n	m	illegal
y	n	ok
y	y	ok
y	m	ok
m	n	ok
m	y	illegal (subject of this thread)
m	m	ok

The patch below handles all these cases:

DOCK	HPA
n	n	builds
n	y	-> y,y
n	m	-> m,m
y	n	builds
y	y	builds
y	m	builds
m	n	builds
m	y	-> m,y
m	m	builds

okay?

-Len

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 222a1cc..e7c955b 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -78,6 +78,7 @@ config HOTPLUG_PCI_IBM
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
 	depends on ACPI && HOTPLUG_PCI
+	select ACPI_DOCK
 	help
 	  Say Y here if you have a system that supports PCI Hotplug
using
 	  ACPI.

Attachment: git.diff
Description: git.diff