Move video/colors.c into video.mod.

diff --git a/ChangeLog.parse-color b/ChangeLog.parse-color
index b241f3b734f772b425ed26b69f4133a479ac208d..81628e89f4e8c1fdfdd0d96db67203e3a8704953 100644 (file)
--- a/ChangeLog.parse-color
+++ b/ChangeLog.parse-color
@@ -1,4 +1,4 @@
-2010-12-10  Colin Watson  <cjwatson@ubuntu.com>
+2010-12-23  Colin Watson  <cjwatson@ubuntu.com>
 
        Move gfxmenu color handling to video, so that gfxterm can use it
        too.
@@ -30,8 +30,7 @@
        * grub-core/Makefile.core.def (kernel) [videoinkernel]: Add
        video/colors.c.
        (gfxmenu): Remove gfxmenu/named_colors.c.
-       (video_colors) [videomodules]: New module, containing
-       video/colors.c.
+       (video) [videomodules]: Add video/colors.c.
 
        Add a background_color command.
 

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index fdf7d0826d361360b4639990ef1846296a17af04..8566c79fb591994904581bc6f4f7c398734797b6 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1442,12 +1442,6 @@ module = {
   enable = i386_pc;
 };
 
-module = {
-  name = video_colors;
-  common = video/colors.c;
-  enable = videomodules;
-};
-
 module = {
   name = video_fb;
   common = video/fb/video_fb.c;
@@ -1460,6 +1454,7 @@ module = {
 module = {
   name = video;
   common = video/video.c;
+  common = video/colors.c;
   enable = videomodules;
 };