[CPUFREQ] Fix up merge conflicts with recent ACPI changes.

Signed-off-by: Dave Jones <davej@redhat.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h
index ebd42a3710b4..6db9a4c15355 100644
--- a/include/linux/raid/bitmap.h
+++ b/include/linux/raid/bitmap.h
@@ -247,6 +247,7 @@ struct bitmap {
 
         atomic_t pending_writes; /* pending writes to the bitmap file */
         wait_queue_head_t write_wait;
+        wait_queue_head_t overflow_wait;
 
 };