From 1c95b6d2bfb721df4859414a4f31ac8ed9c7bc8d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 23 Dec 2010 12:11:44 +0000 Subject: [PATCH] Move video/colors.c into video.mod. --- ChangeLog.parse-color | 5 ++--- grub-core/Makefile.core.def | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ChangeLog.parse-color b/ChangeLog.parse-color index b241f3b73..81628e89f 100644 --- a/ChangeLog.parse-color +++ b/ChangeLog.parse-color @@ -1,4 +1,4 @@ -2010-12-10 Colin Watson +2010-12-23 Colin Watson 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 fdf7d0826..8566c79fb 100644 --- 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; };