summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-27 02:45:10 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-27 02:45:10 +0200
commitd93faa4885183fcea1643619e4058cc7769f9bbe (patch)
treef33cc0a8adfead0e2bff3aee2ff3a7fc4eb0bb9a /drivers/acpi/scan.c
parent4a10c2ac2f368583138b774ca41fac4207911983 (diff)
parentb27b14cebfdb687e6d281d2cf82858a30796dc2a (diff)
Merge branch 'acpi-fixes'
* acpi-fixes: ACPI / scan: fix typo in comments of acpi_bus_unregister_driver() ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index fbdb82e70d1..611ce9061dc 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1121,7 +1121,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver)
EXPORT_SYMBOL(acpi_bus_register_driver);
/**
- * acpi_bus_unregister_driver - unregisters a driver with the APIC bus
+ * acpi_bus_unregister_driver - unregisters a driver with the ACPI bus
* @driver: driver to unregister
*
* Unregisters a driver with the ACPI bus. Searches the namespace for all