[PATCH 6/8] UBUNTU: [Config] FTBFS arm[hf|el]/omap: disable CONFIG_GPIO_ADNP

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64/config.common.ppc64     |    1 +
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 01b69bd..3d0af2c 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -69,6 +69,7 @@ CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_FPE_NWFPE=y
 # CONFIG_FUNCTION_TRACER is not set
+# CONFIG_GPIO_ADNP is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 59bf13c..fcf59e7 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -37,6 +37,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FPE_NWFPE is not set
+CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 9495145..fac01d8 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -37,6 +37,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_FPE_NWFPE=y
+# CONFIG_GPIO_ADNP is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bc68825..8f505d6 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2016,7 +2016,6 @@ CONFIG_GIRBIL_DONGLE=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_ADP5520=m
 CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_AMD8111=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index b31b24b..ebd0ef8 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -56,6 +56,7 @@ CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FUNCTION_TRACER=y
+CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 6595a09..f6dd1d6 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -66,6 +66,7 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FUNCTION_TRACER=y
+CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
-- 
1.7.10.4