projects / linux-flexiantxendom0-natty.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f4f3a9)
UBUNTU: [Config]: CONFIG_SOLO6X10=n for FTBS
authorTim Gardner <tim.gardner@canonical.com>
Sat, 30 Oct 2010 19:31:14 +0000 (20:31 +0100)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 28 Mar 2011 13:49:52 +0000 (06:49 -0700)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

debian.master/config/config.common.ports patch | blob | history
debian.master/config/config.common.ubuntu patch | blob | history

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index ad001b5..4e8433b 100644 (file)
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -3457,7 +3457,6 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOLO6X10=m
 CONFIG_SOUND=m
 # CONFIG_SOUND_OSS_CORE is not set
 # CONFIG_SOUND_PRIME is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a68e3e7..6a1705c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4298,7 +4298,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOLO6X10=m
+# CONFIG_SOLO6X10 is not set
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
Port of xen3.3 xenlinux code to Ubuntu Natty kernel