diff options
| -rw-r--r-- | drivers/ps3/ps3av.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c index 8f3e60f1bfe2..f6c9e56bdba7 100644 --- a/drivers/ps3/ps3av.c +++ b/drivers/ps3/ps3av.c @@ -11,13 +11,14 @@ #include <linux/delay.h> #include <linux/notifier.h> #include <linux/ioctl.h> -#include <linux/fb.h> #include <linux/slab.h> #include <asm/firmware.h> #include <asm/ps3av.h> #include <asm/ps3.h> +#include <video/cmdline.h> + #include "vuart.h" #define BUFSIZE 4096 /* vuart buf size */ @@ -921,9 +922,7 @@ EXPORT_SYMBOL_GPL(ps3av_audio_mute); static int ps3av_probe(struct ps3_system_bus_device *dev) { -#ifdef CONFIG_FB - char *mode_option = NULL; -#endif + const char *mode_option; int res; int id; @@ -971,14 +970,9 @@ static int ps3av_probe(struct ps3_system_bus_device *dev) ps3av_get_hw_conf(ps3av); -#ifdef CONFIG_FB - fb_get_options(NULL, &mode_option); - if (mode_option) { - if (!strcmp(mode_option, "safe")) - safe_mode = 1; - kfree(mode_option); - } -#endif /* CONFIG_FB */ + mode_option = video_get_options(NULL); + if (mode_option && !strcmp(mode_option, "safe")) + safe_mode = 1; id = ps3av_auto_videomode(&ps3av->av_hw_conf); if (id < 0) { printk(KERN_ERR "%s: invalid id :%d\n", __func__, id); |