UBUNTU: [Config] config changes for snapdragon split

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>
Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index dea7f737fcb30edb53c8a21597d12d54c62c3e34..d64a1c1209689fc441127e1cbcdef094eebe5236 100644 (file)
--- 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 92b20b2ff086df62b8e1d7beaea1e367a505144e..752461b49a275901e38186fc15836749ba7d858d 100644 (file)
--- 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 c8d18d353eccd1aec55d32e0ed625e45fcaaacce..b5a1e1df5c1b50f5641f185027f976e318acd728 100644 (file)
--- 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 1654d8b6650d4d3072f9631a8f9bbad98e2970de..84ba36c0f2fb39389dcf6bc6c4ebcb05982dbc86 100644 (file)
--- 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 f6a2c305a2c3ba7077cf948196c1ba318dd9f6d3..6d9d000230827aa04699433dfa5dcc4baf525503 100644 (file)
--- 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 d7aded01c07771806e30bb9496b247cbbc3639a1..0936bb154c3a32ef16cd1d28af199df1e42f621e 100644 (file)
--- 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 8516d2dbc1fb9d211b3d17aa63ad3a7c3afd0da6..e3d18746dbf0bd5e9c29d6b731e6238774a4abcb 100644 (file)
--- 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