diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 15:18:13 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 15:18:13 -0500 |
| commit | ed6a82546d2e8f6b5902269541733814d4adacc2 (patch) | |
| tree | a7c472289a1e3813057fb47cb50d95e55cdf7e65 /drivers/pci | |
| parent | b38f67c4ae35eb4bcea0bf42a0a18a778a5d04c2 (diff) | |
| parent | 296e5809ee567e41d55da41a882abef9d8071e5e (diff) | |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
PCI / hotplug / ACPI: Drop unused acpiphp_debug declaration
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index 26100f510b10..1592dbe4f904 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
| @@ -176,7 +176,6 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot); | |||
| 176 | u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot); | 176 | u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot); |
| 177 | 177 | ||
| 178 | /* variables */ | 178 | /* variables */ |
| 179 | extern bool acpiphp_debug; | ||
| 180 | extern bool acpiphp_disabled; | 179 | extern bool acpiphp_disabled; |
| 181 | 180 | ||
| 182 | #endif /* _ACPIPHP_H */ | 181 | #endif /* _ACPIPHP_H */ |