Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / video / sis / sis.h

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index a259446ca7fe3f883afb49fee8f67dd787b936d2..7d5ee2145e21440af006df7e259e8aa77cef3184 100644 (file)
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -526,7 +526,7 @@ struct sis_video_info {
                u16 vmax;
                u32 dclockmax;
                u8  feature;
-               BOOLEAN datavalid;
+               bool datavalid;
        }               sisfb_thismonitor;
 
        unsigned short  chip_id;        /* PCI ID of chip */