[kernel] r21694 - in dists/trunk/linux/debian: . config/kernelarch-powerpc config/kernelarch-s390

[Bastian Blank]

Author: waldi
Date: Wed Aug  6 20:55:40 2014
New Revision: 21694

Log:
* debian/changelog: Update.
* debian/config/kernelarch-powerpc/config-arch-64,
  debian/config/kernelarch-s390/config-arch-64: Enable PCI hotplug.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
   dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Aug  6 16:29:46 2014	(r21693)
+++ dists/trunk/linux/debian/changelog	Wed Aug  6 20:55:40 2014	(r21694)
@@ -13,6 +13,7 @@
   * 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)

Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64	Wed Aug  6 16:29:46 2014	(r21693)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64	Wed Aug  6 20:55:40 2014	(r21694)
@@ -76,7 +76,9 @@
 ##
 ## 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

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64	Wed Aug  6 16:29:46 2014	(r21693)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64	Wed Aug  6 20:55:40 2014	(r21694)
@@ -11,3 +11,9 @@
 CONFIG_64BIT=y
 CONFIG_PCI=y
 
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_S390=y
+