From de299a3802eb2a31a4b2fdbf6378d5ad6712affa Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Sat, 9 Jun 2012 14:23:13 -0700
Subject: UBUNTU: [Config] Temporarily disable CONFIG_EZX_PCAP on arm

Build failure:

drivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/armel/config.common.armel     | 1 +
 debian.master/config/armhf/config.common.armhf     | 1 +
 debian.master/config/config.common.ubuntu          | 1 -
 debian.master/config/i386/config.common.i386       | 1 +
 debian.master/config/powerpc/config.common.powerpc | 1 +
 debian.master/config/ppc64/config.common.ppc64     | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b4dffe07954..a2e831338cc 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -53,6 +53,7 @@ CONFIG_DM_RAID45=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
+CONFIG_EZX_PCAP=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index e254d5a1d09..c01b3d2653d 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -54,6 +54,7 @@ CONFIG_DW_DMAC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
+# CONFIG_EZX_PCAP is not set
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=y
 CONFIG_FB_ARMCLCD=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b847c3c581d..9f315d36941 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -19,6 +19,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DM_RAID45 is not set
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+# CONFIG_EZX_PCAP is not set
 CONFIG_FAT_FS=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 63231477f2c..afb83180ec1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1693,7 +1693,6 @@ CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 CONFIG_EXYNOS_VIDEO=y
-CONFIG_EZX_PCAP=y
 CONFIG_F71808E_WDT=m
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 298fd235b67..deffcca4665 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -52,6 +52,7 @@ CONFIG_DM_RAID45=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
+CONFIG_EZX_PCAP=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 3cc7feec567..12b413fe4c9 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -46,6 +46,7 @@ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_EVM=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
+CONFIG_EZX_PCAP=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 1c252222f54..3c5e592d673 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -51,6 +51,7 @@ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_EVM=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=m
+CONFIG_EZX_PCAP=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=y
-- 
cgit v1.2.3