diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
commit | bdea534db894ea19320f470ce2e63b1d9de96a15 (patch) | |
tree | 8ec2a0a93d9bb5e7205253c67aa624b9ec227477 /include/acpi/acpi_bus.h | |
parent | 39b5a56ec0be5effe9b7d0f18cb27724bf2e5d47 (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
download | linux-bdea534db894ea19320f470ce2e63b1d9de96a15.tar.gz |
Merge tag 'v3.17-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index bcfd808b1098..c1c9de19edbe 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -246,7 +246,6 @@ struct acpi_device_pnp { acpi_device_name device_name; /* Driver-determined */ acpi_device_class device_class; /* " */ union acpi_object *str_obj; /* unicode string for _STR method */ - unsigned long sun; /* _SUN */ }; #define acpi_device_bid(d) ((d)->pnp.bus_id) |