topconfig enable modular PCIEAER_INJECT

svn path=/dists/trunk/linux-2.6/; revision=14134
This commit is contained in:
Maximilian Attems 2009-08-17 15:10:28 +00:00
parent c9595fe456
commit 1f51035ebd
2 changed files with 7 additions and 1 deletions

3
debian/changelog vendored
View File

@ -26,7 +26,8 @@ linux-2.6 (2.6.31~rc6-1~experimental.1) UNRELEASED; urgency=low
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.

View File

@ -1694,6 +1694,11 @@ CONFIG_HOTPLUG_PCI_CPCI=y
##
# CONFIG_PCIEASPM is not set
##
## file: drivers/pci/pcie/aer/Kconfig.debug
##
CONFIG_PCIEAER_INJECT=m
##
## file: drivers/pcmcia/Kconfig
##