diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 | ||||
| -rw-r--r-- | include/linux/pm_domain.h | 2 |
2 files changed, 1 insertions, 2 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 { | |||
| 246 | acpi_device_name device_name; /* Driver-determined */ | 246 | acpi_device_name device_name; /* Driver-determined */ |
| 247 | acpi_device_class device_class; /* " */ | 247 | acpi_device_class device_class; /* " */ |
| 248 | union acpi_object *str_obj; /* unicode string for _STR method */ | 248 | union acpi_object *str_obj; /* unicode string for _STR method */ |
| 249 | unsigned long sun; /* _SUN */ | ||
| 250 | }; | 249 | }; |
| 251 | 250 | ||
| 252 | #define acpi_device_bid(d) ((d)->pnp.bus_id) | 251 | #define acpi_device_bid(d) ((d)->pnp.bus_id) |
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 7c1d252b20c0..ebc4c76ffb73 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h | |||
| @@ -60,7 +60,7 @@ struct generic_pm_domain { | |||
| 60 | struct mutex lock; | 60 | struct mutex lock; |
| 61 | struct dev_power_governor *gov; | 61 | struct dev_power_governor *gov; |
| 62 | struct work_struct power_off_work; | 62 | struct work_struct power_off_work; |
| 63 | char *name; | 63 | const char *name; |
| 64 | unsigned int in_progress; /* Number of devices being suspended now */ | 64 | unsigned int in_progress; /* Number of devices being suspended now */ |
| 65 | atomic_t sd_count; /* Number of subdomains with power "on" */ | 65 | atomic_t sd_count; /* Number of subdomains with power "on" */ |
| 66 | enum gpd_status status; /* Current state of the domain */ | 66 | enum gpd_status status; /* Current state of the domain */ |