diff --git a/[refs] b/[refs] index 908e0ed09b77..b7dbc543ccb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 115c9ad854bd4c0f58ebcb967ec1b0a1c4e4b2d3 +refs/heads/master: 6af9a803f4d2e4137d9f74a8fc9af4857fbda001 diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h index c54ae562c4d4..efe5f746c561 100644 --- a/trunk/include/acpi/acpi_bus.h +++ b/trunk/include/acpi/acpi_bus.h @@ -271,7 +271,6 @@ struct acpi_device { struct acpi_device_wakeup wakeup; struct acpi_device_perf performance; struct acpi_device_dir dir; - struct acpi_device_ops ops; struct acpi_driver *driver; void *driver_data; struct device dev;