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
This commit is contained in:
Ben Hutchings 2011-12-16 03:36:57 +00:00
parent 64378c34a9
commit cd6d040363
2 changed files with 2 additions and 3 deletions

4
debian/changelog vendored
View File

@ -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)

View File

@ -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