[kernel] r18391 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Fri Dec 16 03:36:57 2011
New Revision: 18391

Log:
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.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Dec 16 03:22:27 2011	(r18390)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 16 03:36:57 2011	(r18391)
@@ -2,8 +2,8 @@
 
   [ 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)
 

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Dec 16 03:22:27 2011	(r18390)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Dec 16 03:36:57 2011	(r18391)
@@ -1208,7 +1208,6 @@
 ##
 CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_MOUSE=m