UBUNTU: [Config] updateconfigs after rebase to Ubuntu-4.4.0-17.33

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.snapdragon/config/config.common.ubuntu b/debian.snapdragon/config/config.common.ubuntu
index c030f663e713bed331494c60598272a742aa9e1a..0777db06dafb5a3783d6efbc402d4329193d1dfa 100644 (file)
--- a/debian.snapdragon/config/config.common.ubuntu
+++ b/debian.snapdragon/config/config.common.ubuntu
@@ -214,6 +214,7 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPRD=y
 CONFIG_ARCH_STRATIX10=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_132_SOC=y
@@ -1923,7 +1924,7 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORCEDETH=m
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FPGA=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3228,8 +3229,10 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_CLUSTER=m
 CONFIG_MD_FAULTY=m
@@ -4175,6 +4178,7 @@ CONFIG_NTB_TRANSPORT=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_RW is not set
+# CONFIG_NUMA is not set
 CONFIG_NVM=y
 CONFIG_NVMEM=y
 # CONFIG_NVM_DEBUG is not set
@@ -4319,7 +4323,10 @@ CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_HISI=y
+CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 # CONFIG_PCI_LAYERSCAPE is not set
@@ -5844,6 +5851,7 @@ CONFIG_SYSFS=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSTEMPORT=m
 CONFIG_SYSTEM_DATA_VERIFICATION=y
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_SYSV68_PARTITION=y