Merge branch 'next' into for-linus

[~andy/linux] / drivers / video / sis / sis.h

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index eac7a01925f3d26e03ab33cc2650a76278993391..1987f1b7212f40732c2c28315d3791b3d08d2652 100644 (file)
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -495,6 +495,7 @@ struct sis_video_info {
        unsigned int    refresh_rate;
 
        unsigned int    chip;
+       unsigned int    chip_real_id;
        u8              revision_id;
        int             sisvga_enabled;         /* PCI device was enabled */