diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /drivers/acpi/scan.c | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (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); |