* debian/changelog: Update.
* debian/config/config: Move PCIe options. * debian/config/ia64/config, debian/config/kernelarch-x86/config: Remove duplicated options. svn path=/dists/trunk/linux-2.6/; revision=14691
This commit is contained in:
parent
2c8d224629
commit
e1be69e95d
|
@ -11,6 +11,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low
|
|||
* Enable PCI_MSI.
|
||||
* [powerpc] Properly enable Apple PMU battery.
|
||||
* [mips/mipsel] Drop remaining OSS drivers.
|
||||
* [powerpc] Enable PCIe support.
|
||||
|
||||
-- Martin Michlmayr <tbm@cyrius.com> Sun, 22 Nov 2009 13:56:12 +0000
|
||||
|
||||
|
|
|
@ -1705,8 +1705,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y
|
|||
##
|
||||
## file: drivers/pci/pcie/Kconfig
|
||||
##
|
||||
CONFIG_PCIEPORTBUS=y
|
||||
CONFIG_HOTPLUG_PCI_PCIE=m
|
||||
# CONFIG_PCIEASPM is not set
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/aer/Kconfig
|
||||
##
|
||||
CONFIG_PCIEAER=y
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/aer/Kconfig.debug
|
||||
##
|
||||
|
|
|
@ -538,16 +538,6 @@ CONFIG_PCMCIA_SPECTRUM=m
|
|||
##
|
||||
CONFIG_HOTPLUG_PCI=m
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/Kconfig
|
||||
##
|
||||
CONFIG_PCIEPORTBUS=y
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/aer/Kconfig
|
||||
##
|
||||
CONFIG_PCIEAER=y
|
||||
|
||||
##
|
||||
## file: drivers/pcmcia/Kconfig
|
||||
##
|
||||
|
|
|
@ -944,17 +944,6 @@ CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
|||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/Kconfig
|
||||
##
|
||||
CONFIG_PCIEPORTBUS=y
|
||||
CONFIG_HOTPLUG_PCI_PCIE=m
|
||||
|
||||
##
|
||||
## file: drivers/pci/pcie/aer/Kconfig
|
||||
##
|
||||
CONFIG_PCIEAER=y
|
||||
|
||||
##
|
||||
## file: drivers/pcmcia/Kconfig
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue