diff options
| author | Kristen Carlson Accardi <kristen.c.accardi@intel.com> | 2006-07-26 13:32:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-08-16 01:00:07 -0400 |
| commit | b5240b32b9b2b75917c478d768191862a2b190cc (patch) | |
| tree | 19b45bf221d7bb6ef19eca93d801906936b87952 /drivers/pci | |
| parent | 07dd4855e7fffeb50565826e5e736509ee8f6129 (diff) | |
| download | op-kernel-dev-b5240b32b9b2b75917c478d768191862a2b190cc.zip op-kernel-dev-b5240b32b9b2b75917c478d768191862a2b190cc.tar.gz | |
ACPIPHP: allow acpiphp to build without ACPI_DOCK
Change the build options for acpiphp so that it may build without being
dependent on the ACPI_DOCK option, but yet does not allow the option of
acpiphp being built-in when dock is built as a module.
This does not change the previous patch for ACPI_IBM_DOCK Kconfig.
For the following matrix of config options, I built an i386 kernel.
Dock acpiphp should it build? confirmed
y y y y
y n y y
y m y y
m y no - acpiphp should acpiphp was
convert to m converted to m
m n y y
m m y y
n y y y
n n y y
n m y y
Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 3fae77f..1c363d8 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -76,7 +76,7 @@ config HOTPLUG_PCI_IBM config HOTPLUG_PCI_ACPI tristate "ACPI PCI Hotplug driver" - depends on ACPI_DOCK && HOTPLUG_PCI + depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI) help Say Y here if you have a system that supports PCI Hotplug using ACPI. |
