Enable SATA_ZPODD and TRACER_SNAPSHOT as we are now doing an ABI bump

svn path=/dists/sid/linux/; revision=21854
This commit is contained in:
Ben Hutchings 2014-09-16 17:34:02 +00:00
parent e126ae3d01
commit 1b0a121a3b
2 changed files with 4 additions and 4 deletions

2
debian/changelog vendored
View File

@ -9,6 +9,8 @@ linux (3.16.2-4) UNRELEASED; urgency=medium
* sfc: Adding PCI ID for Solarflare 7000 series 40G network adapter.
* sfc: Add 40G link capability decoding
* Bump ABI to 2 (Closes: #761874)
* ata: Enable SATA_ZPODD
* tracing: Enable TRACER_SNAPSHOT
[ Ian Campbell ]
* [armhf] Enable support for Exynos5 systems. (Closes: #759291)

View File

@ -146,8 +146,7 @@ CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ATA=m
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
#. TODO: Enable at next ABI bump
# CONFIG_SATA_ZPODD is not set
CONFIG_SATA_ZPODD=y
CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=m
# CONFIG_SATA_AHCI_PLATFORM is not set
@ -5115,8 +5114,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
#. TODO: Enable at next ABI bump
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_TRACER_SNAPSHOT=y
## choice: Branch Profiling
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set