diff --git a/ChangeLog.videomask b/ChangeLog.videomask
new file mode 100644
index 000000000..7c58d0b57
--- /dev/null
+++ b/ChangeLog.videomask
@@ -0,0 +1,10 @@
+2009-11-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use flag-based instead of hook-based video mode selection and "auto"
+	keyword.
+
+	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
+	(grub_video_set_mode): Changed prototype. All users updated.
+	(grub_video_check_mode_flag): New inline function.
+	* video/video.c (parse_modespec): New function.
+	(grub_video_set_mode): Parse flags and keywords.
diff --git a/video/video.c b/video/video.c
index eff257122..2e17ee7dc 100644
--- a/video/video.c
+++ b/video/video.c
@@ -624,7 +624,6 @@ grub_video_set_mode (const char *modestring,
       /* Loop thru all possible video adapter trying to find requested mode.  */
       for (p = grub_video_adapter_list; p; p = p->next)
 	{
-	  grub_err_t err;
 	  struct grub_video_mode_info mode_info;
 
 	  grub_memset (&mode_info, 0, sizeof (mode_info));