UBUNTU: updateconfigs after update to v2.6.38.6

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 8f192a2..9fd4f33 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -101,6 +101,7 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_FONTS is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FSAM7400=m
 CONFIG_FTL=m
 CONFIG_FUNCTION_TRACER=y

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a75a623..8e75666 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -75,6 +75,7 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FSAM7400 is not set
 # CONFIG_FUNCTION_TRACER is not set
 CONFIG_GENERIC_IRQ_PROBE=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 143d986..0bfd697 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1592,7 +1592,6 @@ CONFIG_FORCEDETH=m
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f5f5fb5..988e953 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -100,6 +100,7 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_FONTS is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FSAM7400=m
 CONFIG_FTL=m
 CONFIG_FUNCTION_TRACER=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 66398af..9d583e8 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -90,6 +90,7 @@ CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_FONTS is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FSAM7400 is not set
 CONFIG_FTL=m
 CONFIG_FUNCTION_TRACER=y

diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index e55a6d4..203bb2a 100644 (file)
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -100,6 +100,7 @@ CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=9
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FSAM7400 is not set
 CONFIG_FTL=m
 CONFIG_FUNCTION_TRACER=y