From 356aece5f2a562d05b04fd4b63b362a90ad53b4e Mon Sep 17 00:00:00 2001 From: Toshi Kani Date: Fri, 26 Oct 2012 13:39:06 +0200 Subject: [PATCH] --- yaml --- r: 336672 b: refs/heads/master c: f4fa0e018a175ea92a3187ade8f678599dc5980a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 5 ----- trunk/include/acpi/acpi_bus.h | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index efdc4440b828..a49cdfbb68c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3c450c38075f414077e58439cff6bdce9e47df8 +refs/heads/master: f4fa0e018a175ea92a3187ade8f678599dc5980a diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index ed87f433cec2..19d3d4a1274a 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -1017,11 +1017,6 @@ static int acpi_bus_get_flags(struct acpi_device *device) device->flags.ejectable = 1; } - /* Presence of _LCK indicates 'lockable' */ - status = acpi_get_handle(device->handle, "_LCK", &temp); - if (ACPI_SUCCESS(status)) - device->flags.lockable = 1; - /* Power resources cannot be power manageable. */ if (device->device_type == ACPI_BUS_TYPE_POWER) return 0; diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h index 0daa0fbd8654..e8b2877aea33 100644 --- a/trunk/include/acpi/acpi_bus.h +++ b/trunk/include/acpi/acpi_bus.h @@ -144,12 +144,11 @@ struct acpi_device_flags { u32 bus_address:1; u32 removable:1; u32 ejectable:1; - u32 lockable:1; u32 suprise_removal_ok:1; u32 power_manageable:1; u32 performance_manageable:1; u32 eject_pending:1; - u32 reserved:23; + u32 reserved:24; }; /* File System */