[kernel] r18418 - dists/trunk/linux-2.6/debian/config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sat Dec 24 10:57:51 2011
New Revision: 18418

Log:
Put some Hyper-V config options under drivers/hv/Kconfig for 3.2

Modified:
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Dec 24 10:55:56 2011	(r18417)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Dec 24 10:57:51 2011	(r18418)
@@ -439,6 +439,12 @@
 CONFIG_USB_MOUSE=m
 
 ##
+## file: drivers/hv/Kconfig
+##
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+
+##
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_SENSORS_ADM1021=m
@@ -1289,10 +1295,8 @@
 ##
 ## file: drivers/staging/hv/Kconfig
 ##
-CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_MOUSE=m
 
 ##