aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-11-19 16:58:50 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 02:03:16 -0500
commit1f8e6eee81709cfd500ca05e36b8207566e58222 (patch)
treee10456ef65528bfb4072b66cab86b35d395fd7a1 /drivers
parentec49ec33e22885a255855c2f820b640afbd88ef4 (diff)
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>
Diffstat (limited to 'drivers')
-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 af5e9a29be9b..5baaa79e71f8 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -58,9 +58,4 @@
58/* LINUX KERNEL */ 58/* LINUX KERNEL */
59/**********************************************************************/ 59/**********************************************************************/
60 60
61#if !defined(CONFIG_FB_SIS_300) && !defined(CONFIG_FB_SIS_315)
62#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
63#warning sisfb will not work!
64#endif
65
66#endif /* _OSDEF_H_ */ 61#endif /* _OSDEF_H_ */
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 7feb6992c7cc..7e3370f115b6 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -60,6 +60,11 @@
60#include "sis.h" 60#include "sis.h"
61#include "sis_main.h" 61#include "sis_main.h"
62 62
63#if !defined(CONFIG_FB_SIS_300) && !defined(CONFIG_FB_SIS_315)
64#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
65#warning sisfb will not work!
66#endif
67
63static void sisfb_handle_command(struct sis_video_info *ivideo, 68static void sisfb_handle_command(struct sis_video_info *ivideo,
64 struct sisfb_cmd *sisfb_command); 69 struct sisfb_cmd *sisfb_command);
65 70