diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/acpi/scan.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
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 3b26a7104363..9271e5209ac1 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -851,7 +851,7 @@ static void acpi_device_set_id(struct acpi_device *device, | |||
| 851 | * ---- | 851 | * ---- |
| 852 | * Fix for the system root bus device -- the only root-level device. | 852 | * Fix for the system root bus device -- the only root-level device. |
| 853 | */ | 853 | */ |
| 854 | if ((parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) { | 854 | if (((acpi_handle)parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) { |
| 855 | hid = ACPI_BUS_HID; | 855 | hid = ACPI_BUS_HID; |
| 856 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); | 856 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); |
| 857 | strcpy(device->pnp.device_class, ACPI_BUS_CLASS); | 857 | strcpy(device->pnp.device_class, ACPI_BUS_CLASS); |