Patchwork [4/9] Revert "UBUNTU: [Config] [FTBS] sparc: Temporarily disable CONFIG_MFD_JANZ_CMODIO"

login
register
mail settings
Submitter Leann Ogasawara
Date Aug. 18, 2010, 5:41 p.m.
Message ID <408e8638d6667f4a3ddcabe2287e7f085ba39bd1.1282150973.git.leann.ogasawara@canonical.com>
Download mbox | patch
Permalink /patch/62066/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - Aug. 18, 2010, 5:41 p.m.
This reverts commit 211d44e81055e53003140d51b0d6c0b64a1e7180.

sparc is being decommissioned so drop this patch.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/config.common.ports           |    1 +
 debian.master/config/ia64/config.common.ia64       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 -
 debian.master/config/sparc/config.common.sparc     |    1 -
 4 files changed, 1 insertions(+), 3 deletions(-)

Patch

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 5bf4f26..8e158b3 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1963,6 +1963,7 @@  CONFIG_MEMORY_HOTPLUG_SPARSE=y
 # CONFIG_MEMSTICK is not set
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_CORE=y
+CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_MAX8925=y
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_PCF50633=m
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index 9112923..3bd5fcc 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -147,7 +147,6 @@  CONFIG_MAC80211_MESH=y
 # CONFIG_MACVLAN is not set
 CONFIG_MAC_PARTITION=y
 # CONFIG_MARKERS is not set
-CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MINIX_SUBPARTITION=y
 # CONFIG_MMIO_NVRAM is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index d240868..a0856f6 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -132,7 +132,6 @@  CONFIG_MAC80211_MESH=y
 CONFIG_MACVLAN=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MARKERS=y
-CONFIG_MFD_JANZ_CMODIO=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MOUSE_SERIAL=m
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index b7d1724..ee219bf 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -151,7 +151,6 @@  CONFIG_LZO_COMPRESS=m
 CONFIG_MACVLAN=m
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MARKERS=y
-# CONFIG_MFD_JANZ_CMODIO is not set
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MMIO_NVRAM is not set