diff options
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/processor.h | 1 | ||||
-rw-r--r-- | include/acpi/video.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index b09c4fde9725..4927c063347c 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -84,7 +84,6 @@ struct acpi_processor_power { | |||
84 | struct acpi_processor_cx *state; | 84 | struct acpi_processor_cx *state; |
85 | unsigned long bm_check_timestamp; | 85 | unsigned long bm_check_timestamp; |
86 | u32 default_state; | 86 | u32 default_state; |
87 | u32 bm_activity; | ||
88 | int count; | 87 | int count; |
89 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; | 88 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; |
90 | int timer_broadcast_on_state; | 89 | int timer_broadcast_on_state; |
diff --git a/include/acpi/video.h b/include/acpi/video.h index f0275bb79ce4..af6fe95fd3d0 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h | |||
@@ -3,8 +3,10 @@ | |||
3 | 3 | ||
4 | #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) | 4 | #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) |
5 | extern int acpi_video_register(void); | 5 | extern int acpi_video_register(void); |
6 | extern int acpi_video_exit(void); | ||
6 | #else | 7 | #else |
7 | static inline int acpi_video_register(void) { return 0; } | 8 | static inline int acpi_video_register(void) { return 0; } |
9 | static inline void acpi_video_exit(void) { return; } | ||
8 | #endif | 10 | #endif |
9 | 11 | ||
10 | #endif | 12 | #endif |