From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 28 Nov 2020 22:40:53 +0000 (+0100)
Subject: video: fbdev: sis: Fix defined but not used warnings
X-Git-Tag: v5.12-rc1~132^2~24^2~209
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50b82a2d695753013cc83d70cbd328c6a507c1bf;p=thirdparty%2Fkernel%2Flinux.git

video: fbdev: sis: Fix defined but not used warnings

init.h defines static symbols, so it should only be included
once. Drop the include from sis.h as it is not needed.
This fixes a lot of warnings seen with a W=1 build.

v2:
  - Update subject (Lee)

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: Lee Jones <lee.jones@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201128224114.1033617-8-sam@ravnborg.org
---

diff --git a/drivers/video/fbdev/sis/sis.h b/drivers/video/fbdev/sis/sis.h
index 9f4c3093ccb36..d632f096083b3 100644
--- a/drivers/video/fbdev/sis/sis.h
+++ b/drivers/video/fbdev/sis/sis.h
@@ -15,7 +15,6 @@
 
 #include "vgatypes.h"
 #include "vstruct.h"
-#include "init.h"
 
 #define VER_MAJOR		1
 #define VER_MINOR		8