UBUNTU: [Config] standardise CONFIG_TIPC

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 78ff3ef..fca364d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -387,7 +387,6 @@ CONFIG_TCG_TIS=m
 CONFIG_TCG_TPM=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_THERMAL=y
-CONFIG_TIPC=m
 CONFIG_TMD_HERMES=m
 CONFIG_TPS65010=m
 CONFIG_TRANZPORT=m

diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index 7af0887..af12255 100644 (file)
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -139,7 +139,6 @@ CONFIG_SOUND_OSS_CORE=y
 CONFIG_SPI=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_THERMAL=m
-CONFIG_TIPC=m
 # CONFIG_TTPCI_EEPROM is not set
 CONFIG_TUN=m
 CONFIG_TWL4030_CORE=y

diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index eab5e15..5d6258d 100644 (file)
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -139,7 +139,6 @@ CONFIG_SOUND=m
 # CONFIG_SPI is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_THERMAL=y
-# CONFIG_TIPC is not set
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TUN=y
 # CONFIG_TWL4030_CORE is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8a3c262..3aced15 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4608,6 +4608,7 @@ CONFIG_TIMB_DMA=m
 CONFIG_TIMERFD=y
 CONFIG_TIMER_STATS=y
 CONFIG_TINY_RCU=y
+CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 CONFIG_TI_DAC7512=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 9e19647..0af10c7 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -388,7 +388,6 @@ CONFIG_TCG_TIS=m
 CONFIG_TCG_TPM=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_THERMAL=y
-CONFIG_TIPC=m
 CONFIG_TMD_HERMES=m
 CONFIG_TPS65010=m
 CONFIG_TRANZPORT=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index aaaa18f..ecea441 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -354,7 +354,6 @@ CONFIG_SUNGEM=m
 CONFIG_TCG_TPM=m
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_THERMAL is not set
-CONFIG_TIPC=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_TTPCI_EEPROM=m