Merge drm/drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.git] / include / sound / hdaudio.h

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 45f944d57982800cc176ed782aedbf9b1d30f1fe..06f504c10b80ec84136a159d7156876006c44985 100644 (file)
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -367,7 +367,7 @@ struct hdac_bus {
        /* DRM component interface */
        struct drm_audio_component *audio_component;
        long display_power_status;
-       bool display_power_active;
+       unsigned long display_power_active;
 
        /* parameters required for enhanced capabilities */
        int num_streams;