UBUNTU: [Config] switch CONFIG_FB_VESA back to module

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5e56b86..2a25ccf 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -93,7 +93,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VOODOO1=m

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 6c3e307..344ba88 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -68,7 +68,6 @@ CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_UDL=m
-CONFIG_FB_VESA=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FLATMEM_MANUAL=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ea7f24a..c2cf66a 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1554,6 +1554,7 @@ CONFIG_FB_TMIO=m
 CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VALKYRIE=y
+CONFIG_FB_VESA=m
 CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
 CONFIG_FB_VT8623=m

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 88822e6..e0411b9 100644 (file)
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -55,8 +55,9 @@ value CONFIG_FRAMEBUFFER_CONSOLE y
 
 # GRUB changes will rely on built in vesafb on x86,
 # UbuntuSpec:foundations-m-grub2-boot-framebuffer
-(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
-       value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+#(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
+#      value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
 
 # Build in uinput module so that it's always available (LP: 584812)
 value CONFIG_INPUT_UINPUT y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index c0afb35..d8b6d7b 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -92,7 +92,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VOODOO1=m