diff --git a/debian/changelog b/debian/changelog index e92a31f51..21249fed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ linux (4.5-1~exp2) UNRELEASED; urgency=medium * mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE * mm: ZONE_DEVICE depends on SPARSEMEM_VMEMMAP + * [amd64] Re-enable ZONE_DMA and sound drivers that depend on it + (Closes: #814855) -- Ben Hutchings Fri, 25 Mar 2016 13:43:57 +0000 diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index ede7b19a4..31d25335f 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -2,7 +2,6 @@ ## file: arch/x86/Kconfig ## CONFIG_64BIT=y -# CONFIG_ZONE_DMA is not set CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_CALGARY_IOMMU=y