summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-07 17:22:14 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-08-07 17:22:14 +0200
commit5ad3f3f6eb1fbec716a61dbe46565dcd9ca94387 (patch)
tree482a7bad26e8e12609e5121eb03f29fa329cff8b /drivers/video
parentfbcon: mark dummy functions 'inline' (diff)
downloadlinux-5ad3f3f6eb1fbec716a61dbe46565dcd9ca94387.tar.xz
linux-5ad3f3f6eb1fbec716a61dbe46565dcd9ca94387.zip
fbdev: matrox: hide unused 'hotplug' variable
The variable has become unused in modular configurations which triggers a harmless warning: drivers/video/fbdev/matrox/matroxfb_base.c:1583:12: error: 'hotplug' defined but not used [-Werror=unused-variable] This moves it into an #ifdef section of the file, matching all its references. Fixes: 376b3ff54c9a ("fbdev: Nuke FBINFO_MODULE") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Arvind Yadav <arvind.yadav.cs@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/matrox/matroxfb_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index fd1589fcdf15..00ea4e4ab95a 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -1578,9 +1578,9 @@ static struct fb_videomode defaultmode = {
NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
0, FB_VMODE_NONINTERLACED
};
-#endif /* !MODULE */
static int hotplug = 0;
+#endif /* !MODULE */
static void setDefaultOutputs(struct matrox_fb_info *minfo)
{