diff --git a/[refs] b/[refs] index e63b7ff53d35..6d451ca87734 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5caf5db887b2bc87d74a78674d8e3e4774fa2a14 +refs/heads/master: bd685ac8e78b9bfd4a0145be22a7ff11ab11adef diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index dd6dd6e222d7..f7f228d1c2d9 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -297,10 +297,10 @@ static const struct fb_videomode ps3fb_modedb[] = { #define VP_OFF(i) (WIDTH(i) * Y_OFF(i) * BPP + X_OFF(i) * BPP) #define FB_OFF(i) (GPU_OFFSET - VP_OFF(i) % GPU_OFFSET) -static int ps3fb_mode = 0; +static int ps3fb_mode; module_param(ps3fb_mode, bool, 0); -static char *mode_option __initdata = NULL; +static char *mode_option __initdata; static int ps3fb_get_res_table(u32 xres, u32 yres)