diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
| commit | b24fdd4b3830f77ff71c09eaec6a617e88abe419 (patch) | |
| tree | 123628b3c27646c5ae7dbbdf3ad7e4a041f75916 /drivers/video/fbdev/geode/suspend_gx.c | |
| parent | 029f56db6ac248769f2c260bfaf3c3c0e23e904c (diff) | |
| parent | 640eee067d9aae0bb98d8706001976ff1affaf00 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.10-merged
Conflict resolution temp branch
Diffstat (limited to 'drivers/video/fbdev/geode/suspend_gx.c')
| -rw-r--r-- | drivers/video/fbdev/geode/suspend_gx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c index 1110a527c35c..8c49d4e98772 100644 --- a/drivers/video/fbdev/geode/suspend_gx.c +++ b/drivers/video/fbdev/geode/suspend_gx.c @@ -11,8 +11,6 @@ #include "gxfb.h" -#ifdef CONFIG_PM - static void gx_save_regs(struct gxfb_par *par) { int i; @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) par->powered_down = 0; return 0; } - -#endif |