From 53295dca3342a004403b4bbf95309f048cb19d31 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 21 Sep 2009 19:29:10 +0000 Subject: [PATCH] --- yaml --- r: 166376 b: refs/heads/master c: caaa6efb3d82d0102db9e7094ca5773c46e6780c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 1 + trunk/include/acpi/acpi_bus.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ac06a9753f1c..ada2a20a530d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66b7ed40aaf153d634aabff409a0dda675f37f45 +refs/heads/master: caaa6efb3d82d0102db9e7094ca5773c46e6780c diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index ab5a26469707..c73681b7e69e 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -1240,6 +1240,7 @@ acpi_add_single_object(struct acpi_device **child, return -ENOMEM; } + device->device_type = type; device->handle = handle; device->parent = parent; device->bus_ops = *ops; /* workround for not call .start */ diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h index 1cef1398e358..8456e8cbf9fd 100644 --- a/trunk/include/acpi/acpi_bus.h +++ b/trunk/include/acpi/acpi_bus.h @@ -262,7 +262,8 @@ struct acpi_device_wakeup { /* Device */ struct acpi_device { - acpi_handle handle; + int device_type; + acpi_handle handle; /* no handle for fixed hardware */ struct acpi_device *parent; struct list_head children; struct list_head node;