UBUNTU: [Config] Set CONFIG_WLAN_VENDOR_TI=y for all supported kernels

When disabled this hides a number of options that the annotations
file says should be enabled, so enable it.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0f335d19e55f608e8842f7a2bce5d011f93596c9..1086dda3eb7619b642ccc895d2d99393daae78b4 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -510,7 +510,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 CONFIG_WIMAX=m
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
 CONFIG_X25=m
 # CONFIG_X86_INTEL_MID is not set

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 837039cf07c1f0b9703927ad094fdc9a22e16c63..26d481bd1ed14f0b57f185d2bf7c8c8762338320 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -528,7 +528,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 CONFIG_WIMAX=m
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
 CONFIG_X25=m
 CONFIG_XEN=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 0f194260f77f3c8bc68b58a5a06a7e1ecbabb167..7c6bcfd28c8dca8c1569212367280611736975ad 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -503,7 +503,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 CONFIG_WIMAX=m
-CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WQ_WATCHDOG is not set
 CONFIG_X25=m
 # CONFIG_XEN is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f674cc849c2474656e46168d2fdbd8ee3d9bb19a..cc47dcfc64b1fef5e7eac1862322e50b7c16bdd9 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9494,6 +9494,7 @@ CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_WLAN_VENDOR_ST=y
+CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_WLCORE=m
 CONFIG_WLCORE_SDIO=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 5cae9d2a77c59fd1e95acf9c3139a53ab7e4adc9..df9214df2398c436743bf66d69f03886089cf4b1 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -503,7 +503,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 CONFIG_WIMAX=m
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
 CONFIG_X25=m
 CONFIG_X86_INTEL_MID=y

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index e5acadfa94f3aede39aecb7e192ed1bdcd4c84b6..7534bd96565669b83688d171fb5289ae42b1b38e 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -81,5 +81,4 @@ CONFIG_SCSI_SRP_ATTRS=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_PRINTF is not set
 CONFIG_U3_DART=y
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index ffa6445aec271e665ad64537b23c5cc62f213e62..03119937a1bf21681f5ecfd8f8c4a7fd144cc8a2 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -76,5 +76,4 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
-CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WQ_WATCHDOG=y

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 856a7ff14b63c97e8def352d5c194cd832711eac..9f17d3298ed51ab6a1ced8fb88a840b666e82497 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -76,5 +76,4 @@ CONFIG_SCSI_SRP_ATTRS=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_PRINTF is not set
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index 53b3aff394e29404d1db061de9b694c8b1559272..ce9f254a83cb47f0f7c1e00089cf6ea81aac8f9b 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -81,5 +81,4 @@ CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_U3_DART is not set
-CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WQ_WATCHDOG=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d93104e687a337b46461aedbc64040504c75d8eb..7c7b5a7ebc7a066434c2cad1e46fb48e18d421f3 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -554,7 +554,6 @@ CONFIG_W1=m
 CONFIG_WAN=y
 CONFIG_WDTPCI=m
 CONFIG_WIMAX=m
-# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
 CONFIG_X25=m
 CONFIG_XILINX_WATCHDOG=m