aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-09 14:05:08 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-19 00:03:09 -0700
commit943ba773f04fcd03d91b5b770a0cbe281eab9cd1 (patch)
tree23a2bc594eb76fd05018235bab621f8fe5a71cdb
parent80fa2188549952922035275e8f153765f070a7ea (diff)
UBUNTU: [Config] Temporarily disable CONFIG_TOUCHSCREEN_EGALAX on arm
Build failure: drivers/input/touchscreen/egalax_ts.c:125:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r--debian.master/config/amd64/config.common.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/armhf/config.common.armhf1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
7 files changed, 6 insertions, 1 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 8d5b13b0a83..b4dffe07954 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -260,6 +260,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
# CONFIG_TWL4030_CORE is not set
CONFIG_TWL6040_CORE=y
CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index ee07e1cb738..e254d5a1d09 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -264,6 +264,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
CONFIG_TOUCHSCREEN_W90X900=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_POWER=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index d326f8d3b9c..b847c3c581d 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -84,6 +84,7 @@ CONFIG_SCSI_SPI_ATTRS=m
CONFIG_STANDALONE=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_USB=y
# CONFIG_USB_ARCH_HAS_XHCI is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7988301a575..63231477f2c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5556,7 +5556,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
CONFIG_TOUCHSCREEN_DA9034=m
CONFIG_TOUCHSCREEN_DA9052=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d7e6b7638a9..298fd235b67 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -259,6 +259,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
# CONFIG_TWL4030_CORE is not set
CONFIG_TWL6040_CORE=y
CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a5b4a7feb0c..3cc7feec567 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -250,6 +250,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_USB=m
CONFIG_TWL6040_CORE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index b27235d75df..1c252222f54 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -285,6 +285,7 @@ CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_USB=m
CONFIG_TWL6040_CORE=y