Merge drm/drm-next into drm-misc-next

[mirror_ubuntu-hirsute-kernel.git] / drivers / video / fbdev / geode / lxfb.h

diff --git a/drivers/video/fbdev/geode/lxfb.h b/drivers/video/fbdev/geode/lxfb.h
index ef24bf6d49dc9bf2886b165957c8e7a39135084e..d37b32dbcd686f06954cbad8d37c097f2094ea79 100644 (file)
--- a/drivers/video/fbdev/geode/lxfb.h
+++ b/drivers/video/fbdev/geode/lxfb.h
@@ -29,7 +29,6 @@ struct lxfb_par {
        void __iomem *gp_regs;
        void __iomem *dc_regs;
        void __iomem *vp_regs;
-#ifdef CONFIG_PM
        int powered_down;
 
        /* register state, for power mgmt functionality */
@@ -50,7 +49,6 @@ struct lxfb_par {
        uint32_t hcoeff[DC_HFILT_COUNT * 2];
        uint32_t vcoeff[DC_VFILT_COUNT];
        uint32_t vp_coeff[VP_COEFF_SIZE / 4];
-#endif
 };
 
 static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
@@ -64,11 +62,8 @@ int lx_blank_display(struct fb_info *, int);
 void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
                        unsigned int, unsigned int);
 
-#ifdef CONFIG_PM
 int lx_powerdown(struct fb_info *info);
 int lx_powerup(struct fb_info *info);
-#endif
-
 
 /* Graphics Processor registers (table 6-29 from the data book) */
 enum gp_registers {