[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
This commit is contained in:
Ben Hutchings 2012-03-12 01:03:31 +00:00
parent 8a69d969ec
commit 7cfa39ff88
4 changed files with 11 additions and 4 deletions

6
debian/changelog vendored
View File

@ -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 <u.kleine-koenig@pengutronix.de> Tue, 06 Mar 2012 09:26:00 +0100
linux-2.6 (3.2.9-1) unstable; urgency=high

View File

@ -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

View File

@ -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

View File

@ -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