diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 13:26:19 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 13:26:19 +0400 |
| commit | 88bef5a4074e0568cf54df410f41065c06694d8a (patch) | |
| tree | bc4d59f57ce315bcb16dad5491ab9983ab122d8a /drivers/video/sis/sis_main.h | |
| parent | 054a3fd824705543322d787893de9f3755151517 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| download | linux-88bef5a4074e0568cf54df410f41065c06694d8a.tar.xz | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/video/sis/sis_main.h')
| -rw-r--r-- | drivers/video/sis/sis_main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h index 3e3b7fa05d6c..9540e977270e 100644 --- a/drivers/video/sis/sis_main.h +++ b/drivers/video/sis/sis_main.h @@ -665,11 +665,11 @@ static struct _customttable { /* Interface used by the world */ #ifndef MODULE -SISINITSTATIC int sisfb_setup(char *options); +static int sisfb_setup(char *options); #endif /* Interface to the low level console driver */ -SISINITSTATIC int sisfb_init(void); +static int sisfb_init(void); /* fbdev routines */ static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, |