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

[Bastian Blank]

Author: waldi
Date: Fri Nov 27 16:52:06 2009
New Revision: 14691

Log:
* debian/changelog: Update.
* debian/config/config: Move PCIe options.
* 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	Fri Nov 27 16:46:14 2009	(r14690)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Nov 27 16:52:06 2009	(r14691)
@@ -11,6 +11,7 @@
   * Enable PCI_MSI.
   * [powerpc] Properly enable Apple PMU battery.
   * [mips/mipsel] Drop remaining OSS drivers.
+  * [powerpc] Enable PCIe support.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Nov 27 16:46:14 2009	(r14690)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Nov 27 16:52:06 2009	(r14691)
@@ -1705,9 +1705,16 @@
 ##
 ## 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
 ##
 CONFIG_PCIEAER_INJECT=m

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Fri Nov 27 16:46:14 2009	(r14690)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Fri Nov 27 16:52:06 2009	(r14691)
@@ -539,16 +539,6 @@
 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
 ##
 CONFIG_PCCARD=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Nov 27 16:46:14 2009	(r14690)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Nov 27 16:52:06 2009	(r14691)
@@ -945,17 +945,6 @@
 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
 ##
 CONFIG_PCCARD=m