From cd6d0403633dc40cfa08038cad8feb3b4bc965a5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 16 Dec 2011 03:36:57 +0000 Subject: [PATCH] Do not enable HYPERV_BLOCK; the driver is due to be removed The functionality of the Hyper-V block driver (hv_blkvsc) is being merged into the general storage driver (hv_storvsc) in 3.2. Don't enable the former for just one kernel version. svn path=/dists/sid/linux-2.6/; revision=18391 --- debian/changelog | 4 ++-- debian/config/kernelarch-x86/config | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ceb80da3..92f361a29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,8 @@ linux-2.6 (3.1.5-2) UNRELEASED; urgency=low [ Ben Hutchings ] * staging: r8712u: Add new USB ID (Closes: #651622) - * [x86] Enable HYPERV, HYPERV_STORAGE, HYPERV_BLOCK, HYPERV_NET, - HYPERV_UTILS, HYPERV_MOUSE as modules (Closes: #652014) + * [x86] Enable HYPERV, HYPERV_STORAGE, HYPERV_NET, HYPERV_UTILS, + HYPERV_MOUSE as modules (Closes: #652014) * cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler (Closes: #650119) diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index d98a23d56..4d263f72e 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1208,7 +1208,6 @@ CONFIG_DRM_PSB=m ## CONFIG_HYPERV=m CONFIG_HYPERV_STORAGE=m -CONFIG_HYPERV_BLOCK=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_MOUSE=m