diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/geode/lxfb_core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c index 1da944bdb11a..15150ed41cec 100644 --- a/drivers/video/geode/lxfb_core.c +++ b/drivers/video/geode/lxfb_core.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/console.h> | 17 | #include <linux/console.h> |
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/suspend.h> | ||
20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
21 | #include <linux/fb.h> | 22 | #include <linux/fb.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
@@ -28,6 +29,7 @@ | |||
28 | static char *mode_option; | 29 | static char *mode_option; |
29 | static int noclear, nopanel, nocrt; | 30 | static int noclear, nopanel, nocrt; |
30 | static int vram; | 31 | static int vram; |
32 | static int vt_switch; | ||
31 | 33 | ||
32 | /* Most of these modes are sorted in ascending order, but | 34 | /* Most of these modes are sorted in ascending order, but |
33 | * since the first entry in this table is the "default" mode, | 35 | * since the first entry in this table is the "default" mode, |
@@ -523,6 +525,8 @@ static int __init lxfb_probe(struct pci_dev *pdev, | |||
523 | lxfb_check_var(&info->var, info); | 525 | lxfb_check_var(&info->var, info); |
524 | lxfb_set_par(info); | 526 | lxfb_set_par(info); |
525 | 527 | ||
528 | pm_set_vt_switch(vt_switch); | ||
529 | |||
526 | if (register_framebuffer(info) < 0) { | 530 | if (register_framebuffer(info) < 0) { |
527 | ret = -EINVAL; | 531 | ret = -EINVAL; |
528 | goto err; | 532 | goto err; |
@@ -648,5 +652,8 @@ MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])"); | |||
648 | module_param(vram, int, 0); | 652 | module_param(vram, int, 0); |
649 | MODULE_PARM_DESC(vram, "video memory size"); | 653 | MODULE_PARM_DESC(vram, "video memory size"); |
650 | 654 | ||
655 | module_param(vt_switch, int, 0); | ||
656 | MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume"); | ||
657 | |||
651 | MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX"); | 658 | MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX"); |
652 | MODULE_LICENSE("GPL"); | 659 | MODULE_LICENSE("GPL"); |