aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-09 14:42:54 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-19 00:03:10 -0700
commitad7e2efbbb74aa51dac46dab9c478ba962b2a5fc (patch)
treeccd5774566279cd0252a2baf358833114047c303
parentde299a3802eb2a31a4b2fdbf6378d5ad6712affa (diff)
UBUNTU: [Config] Temporarily disable CONFIG_LIS3L02DQ on arm
Build failure: drivers/staging/iio/accel/lis3l02dq_core.c:714: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 a2e831338cc..2cdbc5ddd6f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -123,6 +123,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LIBERTAS_MESH=y
CONFIG_LIBIPW_DEBUG=y
+CONFIG_LIS3L02DQ=m
CONFIG_LOGIG940_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index c01b3d2653d..80258a8339a 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -123,6 +123,7 @@ CONFIG_LATENCYTOP=y
CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
# CONFIG_LIBERTAS_MESH is not set
+# CONFIG_LIS3L02DQ is not set
CONFIG_LOGIG940_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9f315d36941..badc1250a4c 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -48,6 +48,7 @@ CONFIG_KGDB=y
# CONFIG_KSM is not set
CONFIG_LATENCYTOP=y
# CONFIG_LIBERTAS_MESH is not set
+# CONFIG_LIS3L02DQ is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_MAX_RAW_DEVS=256
CONFIG_MMC_BLOCK=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index afb83180ec1..183ab7254da 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3016,7 +3016,6 @@ CONFIG_LIRC_SIR=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
-CONFIG_LIS3L02DQ=m
CONFIG_LIS3L02DQ_BUF_KFIFO=y
# CONFIG_LIS3L02DQ_BUF_RING_SW is not set
CONFIG_LITELINK_DONGLE=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index deffcca4665..83b47851770 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -123,6 +123,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LIBERTAS_MESH=y
CONFIG_LIBIPW_DEBUG=y
+CONFIG_LIS3L02DQ=m
CONFIG_LOGIG940_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 12b413fe4c9..9f24285ff25 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -111,6 +111,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LIBERTAS_MESH=y
# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_LIS3L02DQ=m
CONFIG_LOGIG940_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 3c5e592d673..d46d9e5a4cf 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -125,6 +125,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LIBERTAS_MESH=y
# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_LIS3L02DQ=m
CONFIG_LOGIG940_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y