[kernel] r18819 - in dists/sid/linux-2.6/debian: . config config/ia64 config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Mon Mar 12 01:03:31 2012
New Revision: 18819

Log:
[x86,ia64] PCI/hotplug: Build-in common hotplug drivers

- Change HOTPLUG_PCI, HOTPLUG_PCI_PCIE to built-in
- [x86] Change HOTPLUG_PCI_ACPI to built-in
- [ia64] Enable HOTPLUG_PCI_SGI as built-in

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/config/ia64/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Mar 12 00:11:20 2012	(r18818)
+++ dists/sid/linux-2.6/debian/changelog	Mon Mar 12 01:03:31 2012	(r18819)
@@ -9,6 +9,12 @@
   * [mips,mipsel] Mark ext4-modules as provided by the kernel-image udeb, remove
     ide-core-modules provide.
 
+  [ Ben Hutchings ]
+  * [x86,ia64] PCI/hotplug: Build-in common hotplug drivers:
+    - Change HOTPLUG_PCI, HOTPLUG_PCI_PCIE to built-in
+    - [x86] Change HOTPLUG_PCI_ACPI to built-in
+    - [ia64] Enable HOTPLUG_PCI_SGI as built-in
+
  -- Uwe Kleine-König <u.kleine-koenig at pengutronix.de>  Tue, 06 Mar 2012 09:26:00 +0100
 
 linux-2.6 (3.2.9-1) unstable; urgency=high

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Mon Mar 12 00:11:20 2012	(r18818)
+++ dists/sid/linux-2.6/debian/config/config	Mon Mar 12 01:03:31 2012	(r18819)
@@ -2395,7 +2395,7 @@
 ## file: drivers/pci/pcie/Kconfig
 ##
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 

Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config	Mon Mar 12 00:11:20 2012	(r18818)
+++ dists/sid/linux-2.6/debian/config/ia64/config	Mon Mar 12 01:03:31 2012	(r18819)
@@ -590,7 +590,8 @@
 ##
 ## file: drivers/pci/hotplug/Kconfig
 ##
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_SGI=y
 
 ##
 ## file: drivers/pcmcia/Kconfig

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Mon Mar 12 00:11:20 2012	(r18818)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Mon Mar 12 01:03:31 2012	(r18819)
@@ -1039,9 +1039,9 @@
 ##
 ## file: drivers/pci/hotplug/Kconfig
 ##
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m