diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
commit | fd8a882b612de93b351996ed42a9557afc1f8c34 (patch) | |
tree | baadcaa7217cc40f41f04eb40c0d1236cf462716 /drivers/acpi/scan.c | |
parent | c8a4f06e4b27dba425ed49fa603d9257e4cd9ece (diff) | |
parent | 3b6efee9231e12fce09c94930bfc59f66f18d662 (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 23e2c6968a1..31218e1d2a1 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1110,7 +1110,7 @@ acpi_add_single_object(struct acpi_device **child, * * TBD: Assumes LDM provides driver hot-plug capability. */ - result = acpi_bus_find_driver(device); + acpi_bus_find_driver(device); end: if (!result) |