diff mbox series

[SRU,B/linux,2/2] UBUNTU: [Config] config changes for snapdragon split

Message ID 20190412223654.25363-3-kleber.souza@canonical.com
State New
Headers show
Series Additional patches for snapdragon split | expand

Commit Message

Kleber Sacilotto de Souza April 12, 2019, 10:36 p.m. UTC 
From: Paolo Pisati <paolo.pisati@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1820868

These are the config changes needed to split the snapdragon package to
its own topic branch.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---
 debian.master/config/amd64/config.common.amd64       | 1 -
 debian.master/config/arm64/config.flavour.generic    | 1 -
 debian.master/config/arm64/config.flavour.snapdragon | 1 -
 debian.master/config/armhf/config.common.armhf       | 1 -
 debian.master/config/config.common.ubuntu            | 1 +
 debian.master/config/i386/config.common.i386         | 1 -
 debian.master/config/ppc64el/config.common.ppc64el   | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index dea7f737fcb3..d64a1c120968 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -9,7 +9,6 @@  CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ADFS_FS=m
-# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_AFFS_FS=m
 CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index 92b20b2ff086..752461b49a27 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -1,7 +1,6 @@ 
 #
 # Config options for config.flavour.generic automatically generated by splitconfig.pl
 #
-# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_ARM_SDE_INTERFACE=y
 # CONFIG_BT_QCOMSMD_HACK is not set
 CONFIG_COMMON_CLK_QCOM=m
diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index c8d18d353ecc..b5a1e1df5c1b 100644
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -1,7 +1,6 @@ 
 #
 # Config options for config.flavour.snapdragon automatically generated by splitconfig.pl
 #
-CONFIG_ADV7511_SNAPDRAGON_HACKS=y
 # CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_BT_QCOMSMD_HACK=y
 CONFIG_COMMON_CLK_QCOM=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1654d8b6650d..84ba36c0f2fb 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -5,7 +5,6 @@  CONFIG_6LOWPAN=m
 CONFIG_ABX500_CORE=y
 CONFIG_AC97_BUS=y
 CONFIG_ADFS_FS=m
-# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_AFFS_FS=m
 CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f6a2c305a2c3..6d9d00023082 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -181,6 +181,7 @@  CONFIG_ADM8211=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_I2C=m
 CONFIG_ADT7316_SPI=m
+# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_ADXRS450=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d7aded01c077..0936bb154c3a 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -9,7 +9,6 @@  CONFIG_AC97_BUS=m
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ADFS_FS=m
-# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_AFFS_FS=m
 CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 8516d2dbc1fb..e3d18746dbf0 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -6,7 +6,6 @@  CONFIG_6LOWPAN=m
 CONFIG_ABX500_CORE=y
 CONFIG_AC97_BUS=m
 CONFIG_ADFS_FS=m
-# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_AFFS_FS=m
 CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m