diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/acpi/scan.c | |
parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (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 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); |