UBUNTU: Start new release

[mirror_ubuntu-zesty-kernel.git] / debian.master / config / powerpc / config.common.powerpc

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index c590434a030bca4713e005f596072aa7470fb983..db66dd471bec5a891c319e6ecd2383fe2bf031e2 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -117,7 +117,6 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 # CONFIG_HIO is not set
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HPFS_FS=m
 CONFIG_HP_ILO=m
@@ -166,6 +165,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
@@ -280,6 +280,7 @@ CONFIG_OSF_PARTITION=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 # CONFIG_PCI_MSI_IRQ_DOMAIN is not set
 CONFIG_PCI_PASID=y