[kernel] r14134 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon Aug 17 15:10:28 2009
New Revision: 14134

Log:
topconfig enable modular PCIEAER_INJECT

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Aug 17 09:01:13 2009	(r14133)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug 17 15:10:28 2009	(r14134)
@@ -26,7 +26,8 @@
     REGULATOR_MAX1586, REGULATOR_LP3971, MEDIA_SUPPORT, CUSE,
     WL12XX, PPS, AB3100_CORE, SND_HDA_INPUT_JACK,MMC_SDHCI_PLTFM,
     MMC_CB710, MMC_VIA_SDMMC, LEDS_LP3944, RTC_DRV_RX8025,
-    SMARTJOYPLUS_FF, USB_CDC_PHONET, USB_GSPCA_SN9C20X, MOUSE_SYNAPTICS_I2C.
+    SMARTJOYPLUS_FF, USB_CDC_PHONET, USB_GSPCA_SN9C20X, MOUSE_SYNAPTICS_I2C,
+    PCIEAER_INJECT.
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Aug 17 09:01:13 2009	(r14133)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug 17 15:10:28 2009	(r14134)
@@ -1695,6 +1695,11 @@
 # CONFIG_PCIEASPM is not set
 
 ##
+## file: drivers/pci/pcie/aer/Kconfig.debug
+##
+CONFIG_PCIEAER_INJECT=m
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 CONFIG_PCMCIA_LOAD_CIS=y