From 7cfa39ff88dafdd6ab1180b95500ed5002203172 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 12 Mar 2012 01:03:31 +0000 Subject: [PATCH] [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 svn path=/dists/sid/linux-2.6/; revision=18819 --- debian/changelog | 6 ++++++ debian/config/config | 2 +- debian/config/ia64/config | 3 ++- debian/config/kernelarch-x86/config | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 427c28f47..8f58bf4b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,12 @@ linux-2.6 (3.2.9-2) UNRELEASED; urgency=low * [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 Tue, 06 Mar 2012 09:26:00 +0100 linux-2.6 (3.2.9-1) unstable; urgency=high diff --git a/debian/config/config b/debian/config/config index 08c4f8c4f..e68892a9c 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2395,7 +2395,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y ## 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 diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 5e601ebb1..dca49dde7 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -590,7 +590,8 @@ CONFIG_PCMCIA_SPECTRUM=m ## ## file: drivers/pci/hotplug/Kconfig ## -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_SGI=y ## ## file: drivers/pcmcia/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 3f6733728..bba87603e 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1039,9 +1039,9 @@ CONFIG_HT_IRQ=y ## ## 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