* debian/changelog: Update.

* debian/config/config: Enable PCI_MSI.
* debian/config/ia64/config, debian/config/kernelarch-x86/config:
  Remove duplicated options.

svn path=/dists/trunk/linux-2.6/; revision=14667
This commit is contained in:
Bastian Blank 2009-11-23 23:22:59 +00:00
parent 4b79f318d1
commit 9dc6310f5a
4 changed files with 4 additions and 6 deletions

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low
* [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug * [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug
user). user).
[ Bastian Blank ]
* Enable PCI_MSI.
-- Martin Michlmayr <tbm@cyrius.com> Sun, 22 Nov 2009 13:56:12 +0000 -- Martin Michlmayr <tbm@cyrius.com> Sun, 22 Nov 2009 13:56:12 +0000
linux-2.6 (2.6.32~rc8-1~experimental.1) unstable; urgency=low linux-2.6 (2.6.32~rc8-1~experimental.1) unstable; urgency=low

View File

@ -1691,6 +1691,7 @@ CONFIG_PARPORT_1284=y
## ##
## file: drivers/pci/Kconfig ## file: drivers/pci/Kconfig
## ##
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y CONFIG_PCI_LEGACY=y
CONFIG_PCI_STUB=m CONFIG_PCI_STUB=m
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y

View File

@ -533,11 +533,6 @@ CONFIG_PCI_HERMES=m
CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m CONFIG_PCMCIA_SPECTRUM=m
##
## file: drivers/pci/Kconfig
##
CONFIG_PCI_MSI=y
## ##
## file: drivers/pci/hotplug/Kconfig ## file: drivers/pci/hotplug/Kconfig
## ##

View File

@ -928,7 +928,6 @@ CONFIG_PCMCIA_HERMES=m
## ##
## file: drivers/pci/Kconfig ## file: drivers/pci/Kconfig
## ##
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
CONFIG_HT_IRQ=y CONFIG_HT_IRQ=y