From: Seth Forshee <seth.forshee@canonical.com>
Date: Mon, 21 Nov 2016 15:55:28 +0000 (-0600)
Subject: UBUNTU: [Config] Set CONFIG_WLAN_VENDOR_TI=y for all supported kernels
X-Git-Tag: Ubuntu-4.10.0-9.11~190
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0505d83e118a2aea0237c46df4de8f1bfa474482;p=mirror_ubuntu-zesty-kernel.git

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 0f335d19e55f..1086dda3eb76 100644
--- 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 837039cf07c1..26d481bd1ed1 100644
--- 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 0f194260f77f..7c6bcfd28c8d 100644
--- 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 f674cc849c24..cc47dcfc64b1 100644
--- 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 5cae9d2a77c5..df9214df2398 100644
--- 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 e5acadfa94f3..7534bd965656 100644
--- 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 ffa6445aec27..03119937a1bf 100644
--- 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 856a7ff14b63..9f17d3298ed5 100644
--- 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 53b3aff394e2..ce9f254a83cb 100644
--- 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 d93104e687a3..7c7b5a7ebc7a 100644
--- 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