aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-11-19 21:58:50 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 16:03:16 +0900
commit1f8e6eee81709cfd500ca05e36b8207566e58222 (patch)
treee10456ef65528bfb4072b66cab86b35d395fd7a1
parentec49ec33e22885a255855c2f820b640afbd88ef4 (diff)
downloadmrst-s0i3-test-1f8e6eee81709cfd500ca05e36b8207566e58222.tar.gz
mrst-s0i3-test-1f8e6eee81709cfd500ca05e36b8207566e58222.tar.xz
mrst-s0i3-test-1f8e6eee81709cfd500ca05e36b8207566e58222.zip
sisfb: move the CONFIG warning to sis_main.c
sis_main.c is always compiled, so we can check Kconfig options there. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Thomas Winischhofer <thomas@winischhofer.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/sis/osdef.h5
-rw-r--r--drivers/video/sis/sis_main.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index af5e9a29be9..5baaa79e71f 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -58,9 +58,4 @@
/* LINUX KERNEL */
/**********************************************************************/
-#if !defined(CONFIG_FB_SIS_300) && !defined(CONFIG_FB_SIS_315)
-#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
-#warning sisfb will not work!
-#endif
-
#endif /* _OSDEF_H_ */
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 7feb6992c7c..7e3370f115b 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -60,6 +60,11 @@
#include "sis.h"
#include "sis_main.h"
+#if !defined(CONFIG_FB_SIS_300) && !defined(CONFIG_FB_SIS_315)
+#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
+#warning sisfb will not work!
+#endif
+
static void sisfb_handle_command(struct sis_video_info *ivideo,
struct sisfb_cmd *sisfb_command);