git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
video
/
valkyriefb.c
diff --git
a/drivers/video/valkyriefb.c
b/drivers/video/valkyriefb.c
index
e6c4862
..
fd8eb47
100644
(file)
--- a/
drivers/video/valkyriefb.c
+++ b/
drivers/video/valkyriefb.c
@@
-118,9
+118,7
@@
static int valkyriefb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
static int valkyriefb_blank(int blank_mode, struct fb_info *info);
static int read_valkyrie_sense(struct fb_info_valkyrie *p);
static int valkyriefb_blank(int blank_mode, struct fb_info *info);
static int read_valkyrie_sense(struct fb_info_valkyrie *p);
-static inline int valkyrie_vram_reqd(int video_mode, int color_mode);
static void set_valkyrie_clock(unsigned char *params);
static void set_valkyrie_clock(unsigned char *params);
-static inline int valkyrie_par_to_var(struct fb_par_valkyrie *par, struct fb_var_screeninfo *var);
static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
struct fb_par_valkyrie *par, const struct fb_info *fb_info);
static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
struct fb_par_valkyrie *par, const struct fb_info *fb_info);
@@
-171,6
+169,12
@@
static int valkyriefb_set_par(struct fb_info *info)
return 0;
}
return 0;
}
+static inline int valkyrie_par_to_var(struct fb_par_valkyrie *par,
+ struct fb_var_screeninfo *var)
+{
+ return mac_vmode_to_var(par->vmode, par->cmode, var);
+}
+
static int
valkyriefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
static int
valkyriefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
@@
-252,7
+256,7
@@
static int valkyriefb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
return 0;
}
return 0;
}
-static int valkyrie_vram_reqd(int video_mode, int color_mode)
+static in
line in
t valkyrie_vram_reqd(int video_mode, int color_mode)
{
int pitch;
struct valkyrie_regvals *init = valkyrie_reg_init[video_mode-1];
{
int pitch;
struct valkyrie_regvals *init = valkyrie_reg_init[video_mode-1];
@@
-504,11
+508,6
@@
static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
return 0;
}
return 0;
}
-static int valkyrie_par_to_var(struct fb_par_valkyrie *par, struct fb_var_screeninfo *var)
-{
- return mac_vmode_to_var(par->vmode, par->cmode, var);
-}
-
static void valkyrie_init_fix(struct fb_fix_screeninfo *fix, struct fb_info_valkyrie *p)
{
memset(fix, 0, sizeof(*fix));
static void valkyrie_init_fix(struct fb_fix_screeninfo *fix, struct fb_info_valkyrie *p)
{
memset(fix, 0, sizeof(*fix));