[PATCH 3/9] Revert "UBUNTU: [Config] [FTBS] sparc: Temporarily disable CONFIG_MTD_NAND_DENALI"

[leann.ogasawara at canonical.com]

This reverts commit d52f956ff62ff765c27168ddd04315d0273ffc45.

sparc is being decommissioned so drop this patch.

Signed-off-by: Leann Ogasawara <leann.ogasawara at 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(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 5d9563a..5bf4f26 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -2103,6 +2103,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index f3f3ae8..9112923 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -153,7 +153,6 @@ CONFIG_MINIX_SUBPARTITION=y
 # CONFIG_MMIO_NVRAM is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MTD_NAND_DENALI=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_NCPFS_SMALLDOS is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 7cc85e4..d240868 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -137,7 +137,6 @@ CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MTD_NAND_DENALI=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_NCPFS_SMALLDOS is not set
 CONFIG_NET_IPGRE=m
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index 6958b88..b7d1724 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -157,7 +157,6 @@ CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MMIO_NVRAM is not set
 CONFIG_MOUSE_SERIAL=y
 # CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 CONFIG_NCPFS_SMALLDOS=y
 CONFIG_NEED_DMA_MAP_STATE=y
-- 
1.7.0.4