From 3eca66001e58a175eb67a13d9d0d53f49fa089b7 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 3 Dec 2009 00:23:13 +0100 Subject: [PATCH] Fix vga-mode-3 typo in video hooks We have been using vga-mode3 while the standard says vga-mode-3. This might fix (or even break) some resume issues on hardware which did not have any video quirks, since the option is set in fdi/information/10freedesktop/99-video-quirk-default.fdi from hal-info. http://bugs.freedesktop.org/show_bug.cgi?id=25334 Signed-off-by: Tormod Volden --- man/pm-action.xml | 2 +- pm/module.d/uswsusp | 2 +- pm/sleep.d/98smart-kernel-video | 2 +- pm/sleep.d/99video | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/pm-action.xml b/man/pm-action.xml index 2bde946..8aedcfe 100644 --- a/man/pm-action.xml +++ b/man/pm-action.xml @@ -277,7 +277,7 @@ - + This option will try to force the video card into a standard diff --git a/pm/module.d/uswsusp b/pm/module.d/uswsusp index 53f304e..264db25 100755 --- a/pm/module.d/uswsusp +++ b/pm/module.d/uswsusp @@ -25,7 +25,7 @@ uswsusp_get_quirks() vbe-post) OPTS="$OPTS --vbe_post" ;; vbemode-restore) OPTS="$OPTS --vbe_mode" ;; vbestate-restore) OPTS="$OPTS --vbe_save" ;; - vga-mode3) ;; # no-op + vga-mode-3) ;; # no-op save-pci) OPTS="$OPTS --pci_save" ;; none) QUIRK_NONE="true" ;; *) continue ;; diff --git a/pm/sleep.d/98smart-kernel-video b/pm/sleep.d/98smart-kernel-video index 4259397..cc59112 100755 --- a/pm/sleep.d/98smart-kernel-video +++ b/pm/sleep.d/98smart-kernel-video @@ -17,7 +17,7 @@ remove_all_video_quirks() --quirk-s3-bios \ --quirk-vbe-post \ --quirk-vbe-post \ - --quirk-vga-mode3 \ + --quirk-vga-mode-3 \ --quirk-vbemode-restore \ --quirk-vbestate-restore \ --quirk-reset-brightness \ diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video index 29f2f2c..1ebf342 100755 --- a/pm/sleep.d/99video +++ b/pm/sleep.d/99video @@ -25,7 +25,7 @@ for opt in $PM_CMDLINE; do vbe-post) QUIRK_VBE_POST="true" ;; vbemode-restore) QUIRK_VBEMODE_RESTORE="true" ;; vbestate-restore) QUIRK_VBESTATE_RESTORE="true" ;; - vga-mode3) QUIRK_VGA_MODE_3="true" ;; + vga-mode-3) QUIRK_VGA_MODE_3="true" ;; no-fb) QUIRK_NOFB="true" ;; pci-save) QUIRK_PCI_SAVE="true" ;; no-chvt) QUIRK_NO_CHVT="true" ;; @@ -197,7 +197,7 @@ help() { echo " --quirk-vbe-post" echo " --quirk-vbemode-restore" echo " --quirk-vbestate-restore" - echo " --quirk-vga-mode3" + echo " --quirk-vga-mode-3" echo " --quirk-none" } -- 1.6.5