diff mbox

[2/9] Revert "UBUNTU: [Config] [FTBS] ia64: Temporarily disable gpiolib"

Message ID 3bf49d9b671b3eb942402fc7a64036e708cd98f3.1282150973.git.leann.ogasawara@canonical.com
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Leann Ogasawara Aug. 18, 2010, 5:41 p.m. UTC 
This reverts commit e4dc6066ab42e09d3924ece6cdb88e7dd3247a84.

ia64 is being decommissioned so drop this patch.

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

Patch

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 3be1fc9..5d9563a 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -116,6 +116,7 @@  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -1032,6 +1033,7 @@  CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_UVESA=m
 CONFIG_FB_VALKYRIE=y
 # CONFIG_FB_VGA16 is not set
+CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VT8623=m
@@ -1135,6 +1137,7 @@  CONFIG_GIGASET_I4L=y
 # CONFIG_GIGASET_M101 is not set
 # CONFIG_GIGASET_M105 is not set
 CONFIG_GIRBIL_DONGLE=m
+CONFIG_GPIOLIB=y
 CONFIG_GPIO_ADP5520=m
 CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_BT8XX=m
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index fffffa2..f3f3ae8 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -9,7 +9,6 @@  CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_AMD8111_ETH=m
 CONFIG_AMIGA_PARTITION=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_REQUIRE_GPIOLIB is not set
 CONFIG_ARCNET=m
 CONFIG_ATA=m
 CONFIG_ATARI_PARTITION=y
@@ -64,7 +63,6 @@  CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIA is not set
 CONFIG_FB_VOODOO1=y
 # CONFIG_FIREWIRE is not set
 # CONFIG_FLATMEM_MANUAL is not set
@@ -74,7 +72,6 @@  CONFIG_FUSION_MAX_SGE=128
 CONFIG_GAMEPORT=m
 # CONFIG_GELIC_NET is not set
 CONFIG_GENERIC_IOMAP=y
-# CONFIG_GPIOLIB is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 87cb54c..7cc85e4 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -8,7 +8,6 @@  CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 # CONFIG_ALIM7101_WDT is not set
 CONFIG_AMD8111_ETH=m
 CONFIG_AMIGA_PARTITION=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCNET=m
 CONFIG_ATA=y
 CONFIG_ATARI_PARTITION=y
@@ -57,7 +56,6 @@  CONFIG_FB_PS3=y
 CONFIG_FB_RIVA=m
 CONFIG_FB_SIS=m
 CONFIG_FB_TRIDENT=m
-CONFIG_FB_VIA=m
 CONFIG_FB_VOODOO1=y
 CONFIG_FIREWIRE=m
 CONFIG_FORCEDETH=m
@@ -65,7 +63,6 @@  CONFIG_FUSION_MAX_SGE=128
 CONFIG_GAMEPORT=m
 CONFIG_GELIC_NET=m
 # CONFIG_GENERIC_IOMAP is not set
-CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index 20fd36e..6958b88 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -65,7 +65,6 @@  CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TRIDENT is not set
-CONFIG_FB_VIA=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FIREWIRE is not set
 # CONFIG_FLATMEM_MANUAL is not set
@@ -73,7 +72,6 @@  CONFIG_FB_VIA=m
 CONFIG_FUSION_MAX_SGE=40
 # CONFIG_GAMEPORT is not set
 # CONFIG_GELIC_NET is not set
-CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMACHI is not set
 # CONFIG_HAMRADIO is not set