From b92b283868a22bfaa87592594697d18d1a3b11eb Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 6 Aug 2014 20:55:40 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/kernelarch-powerpc/config-arch-64, debian/config/kernelarch-s390/config-arch-64: Enable PCI hotplug. svn path=/dists/trunk/linux/; revision=21694 --- debian/changelog | 1 + debian/config/kernelarch-powerpc/config-arch-64 | 4 +++- debian/config/kernelarch-s390/config-arch-64 | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f815105bd..8153caffb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium * Enable more Nftables modules. * [x86] Enable EARLY_PRINTK_EFI. * Enable stack protector on all supported architectures. (closes: #756898) + * [powerpc64, s390x] Enable PCI hotplug. [ Ben Hutchings ] * udeb: Add new sound drivers to sound-modules (thanks to Samuel Thibault) diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index 8cab33d2e..50fb88f59 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -76,7 +76,9 @@ CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 ## ## file: drivers/pci/hotplug/Kconfig ## -# CONFIG_HOTPLUG_PCI is not set +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_RPA=m +CONFIG_HOTPLUG_PCI_RPA_DLPAR=m ## ## file: drivers/scsi/Kconfig diff --git a/debian/config/kernelarch-s390/config-arch-64 b/debian/config/kernelarch-s390/config-arch-64 index 3b6fb2a26..ba8234557 100644 --- a/debian/config/kernelarch-s390/config-arch-64 +++ b/debian/config/kernelarch-s390/config-arch-64 @@ -11,3 +11,9 @@ CONFIG_MARCH_Z900=y CONFIG_64BIT=y CONFIG_PCI=y +## +## file: drivers/pci/hotplug/Kconfig +## +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_S390=y +