diff options
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 9c4a39ee89b5..2f1289eebb3c 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig | |||
@@ -78,7 +78,7 @@ config HOTPLUG_PCI_IBM | |||
78 | 78 | ||
79 | config HOTPLUG_PCI_ACPI | 79 | config HOTPLUG_PCI_ACPI |
80 | tristate "ACPI PCI Hotplug driver" | 80 | tristate "ACPI PCI Hotplug driver" |
81 | depends on ACPI_BUS && HOTPLUG_PCI | 81 | depends on ACPI && HOTPLUG_PCI |
82 | help | 82 | help |
83 | Say Y here if you have a system that supports PCI Hotplug using | 83 | Say Y here if you have a system that supports PCI Hotplug using |
84 | ACPI. | 84 | ACPI. |
@@ -157,7 +157,7 @@ config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE | |||
157 | 157 | ||
158 | config HOTPLUG_PCI_SHPC_PHPRM_LEGACY | 158 | config HOTPLUG_PCI_SHPC_PHPRM_LEGACY |
159 | bool "For AMD SHPC only: Use $HRT for resource/configuration" | 159 | bool "For AMD SHPC only: Use $HRT for resource/configuration" |
160 | depends on HOTPLUG_PCI_SHPC && !ACPI_BUS | 160 | depends on HOTPLUG_PCI_SHPC && !ACPI |
161 | help | 161 | help |
162 | Say Y here for AMD SHPC. You have to select this option if you are | 162 | Say Y here for AMD SHPC. You have to select this option if you are |
163 | using this driver on platform with AMD SHPC. | 163 | using this driver on platform with AMD SHPC. |
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 31a307004b94..246586a3d91a 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile | |||
@@ -51,7 +51,7 @@ pciehp-objs := pciehp_core.o \ | |||
51 | pciehp_ctrl.o \ | 51 | pciehp_ctrl.o \ |
52 | pciehp_pci.o \ | 52 | pciehp_pci.o \ |
53 | pciehp_hpc.o | 53 | pciehp_hpc.o |
54 | ifdef CONFIG_ACPI_BUS | 54 | ifdef CONFIG_ACPI |
55 | pciehp-objs += pciehprm_acpi.o | 55 | pciehp-objs += pciehprm_acpi.o |
56 | else | 56 | else |
57 | pciehp-objs += pciehprm_nonacpi.o | 57 | pciehp-objs += pciehprm_nonacpi.o |
@@ -62,7 +62,7 @@ shpchp-objs := shpchp_core.o \ | |||
62 | shpchp_pci.o \ | 62 | shpchp_pci.o \ |
63 | shpchp_sysfs.o \ | 63 | shpchp_sysfs.o \ |
64 | shpchp_hpc.o | 64 | shpchp_hpc.o |
65 | ifdef CONFIG_ACPI_BUS | 65 | ifdef CONFIG_ACPI |
66 | shpchp-objs += shpchprm_acpi.o | 66 | shpchp-objs += shpchprm_acpi.o |
67 | else | 67 | else |
68 | ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY | 68 | ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY |