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

[Bastian Blank]

Author: waldi
Date: Mon Nov 23 23:22:59 2009
New Revision: 14667

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

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Nov 23 23:20:06 2009	(r14666)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Nov 23 23:22:59 2009	(r14667)
@@ -4,6 +4,9 @@
   * [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug
     user).
 
+  [ Bastian Blank ]
+  * Enable PCI_MSI.
+
  -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 
 linux-2.6 (2.6.32~rc8-1~experimental.1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Nov 23 23:20:06 2009	(r14666)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Nov 23 23:22:59 2009	(r14667)
@@ -1691,6 +1691,7 @@
 ##
 ## file: drivers/pci/Kconfig
 ##
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY=y
 CONFIG_PCI_STUB=m
 CONFIG_PCI_IOV=y

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Mon Nov 23 23:20:06 2009	(r14666)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Mon Nov 23 23:22:59 2009	(r14667)
@@ -534,11 +534,6 @@
 CONFIG_PCMCIA_SPECTRUM=m
 
 ##
-## file: drivers/pci/Kconfig
-##
-CONFIG_PCI_MSI=y
-
-##
 ## file: drivers/pci/hotplug/Kconfig
 ##
 CONFIG_HOTPLUG_PCI=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Nov 23 23:20:06 2009	(r14666)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Nov 23 23:22:59 2009	(r14667)
@@ -928,7 +928,6 @@
 ##
 ## file: drivers/pci/Kconfig
 ##
-CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_HT_IRQ=y