diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 12:10:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:11:34 -0400 |
| commit | 76f58584824c61eb5b3bdbf019236815921d2e7c (patch) | |
| tree | a8cb03339eddd5ada3c9d04b70b8bd6520e2bc14 /drivers/pci | |
| parent | 8466361ad5233d4356a4601e16b66c25277920d1 (diff) | |
| download | linux-3.10-76f58584824c61eb5b3bdbf019236815921d2e7c.tar.gz linux-3.10-76f58584824c61eb5b3bdbf019236815921d2e7c.tar.bz2 linux-3.10-76f58584824c61eb5b3bdbf019236815921d2e7c.zip | |
[ACPI] delete CONFIG_ACPI_BUS
it is a synonym for CONFIG_ACPI
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/pci/hotplug/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 9c4a39ee89b..2f1289eebb3 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -78,7 +78,7 @@ config HOTPLUG_PCI_IBM config HOTPLUG_PCI_ACPI tristate "ACPI PCI Hotplug driver" - depends on ACPI_BUS && HOTPLUG_PCI + depends on ACPI && HOTPLUG_PCI help Say Y here if you have a system that supports PCI Hotplug using ACPI. @@ -157,7 +157,7 @@ config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE config HOTPLUG_PCI_SHPC_PHPRM_LEGACY bool "For AMD SHPC only: Use $HRT for resource/configuration" - depends on HOTPLUG_PCI_SHPC && !ACPI_BUS + depends on HOTPLUG_PCI_SHPC && !ACPI help Say Y here for AMD SHPC. You have to select this option if you are using this driver on platform with AMD SHPC. diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 31a307004b9..246586a3d91 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile @@ -51,7 +51,7 @@ pciehp-objs := pciehp_core.o \ pciehp_ctrl.o \ pciehp_pci.o \ pciehp_hpc.o -ifdef CONFIG_ACPI_BUS +ifdef CONFIG_ACPI pciehp-objs += pciehprm_acpi.o else pciehp-objs += pciehprm_nonacpi.o @@ -62,7 +62,7 @@ shpchp-objs := shpchp_core.o \ shpchp_pci.o \ shpchp_sysfs.o \ shpchp_hpc.o -ifdef CONFIG_ACPI_BUS +ifdef CONFIG_ACPI shpchp-objs += shpchprm_acpi.o else ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY |