hrev47235 adds 1 changeset to branch 'master' old head: 30275c3f99d414cefb7a9df667dc3cd16ef4c25b new head: 5c62e15f7615886d6c4cf395403bf9d0b8f82af1 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5c62e15+%5E30275c3 ---------------------------------------------------------------------------- 5c62e15: Fix bitrot, parent unused error and acpi_object_type union change. [ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev47235 Commit: 5c62e15f7615886d6c4cf395403bf9d0b8f82af1 URL: http://cgit.haiku-os.org/haiku/commit/?id=5c62e15 Author: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> Date: Tue May 20 20:17:25 2014 UTC ---------------------------------------------------------------------------- 1 file changed, 2 insertions(+), 2 deletions(-) src/add-ons/kernel/drivers/display/display_controls.cpp | 4 ++-- ---------------------------------------------------------------------------- diff --git a/src/add-ons/kernel/drivers/display/display_controls.cpp b/src/add-ons/kernel/drivers/display/display_controls.cpp index 4fd36aa..757ffeb 100644 --- a/src/add-ons/kernel/drivers/display/display_controls.cpp +++ b/src/add-ons/kernel/drivers/display/display_controls.cpp @@ -46,7 +46,7 @@ displaycontrols_init_device(void *_cookie, void **cookie) { device_node *node = (device_node *)_cookie; displaycontrols_device_info *device; - device_node *parent; +// device_node *parent; acpi_objects arguments; acpi_object_type argument; @@ -67,7 +67,7 @@ displaycontrols_init_device(void *_cookie, void **cookie) } argument.object_type = ACPI_TYPE_INTEGER; - argument.data.integer = BIOS_DISPLAY_SWITCH | BIOS_BRIGHTNESS_CONTROL; + argument.integer.integer = BIOS_DISPLAY_SWITCH | BIOS_BRIGHTNESS_CONTROL; arguments.count = 1; arguments.pointer = &argument; if (sAcpi->evaluate_object(&device->acpi_device, "_DOS", &arguments, NULL, 0)