summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-01-13 17:51:46 -0500
committerDave Jones <davej@redhat.com>2012-01-13 17:51:46 -0500
commit399bcf0db6187b13737b483b7d516ef11e0b0d02 (patch)
tree5974ebede11c77dbd5145c9b932920f5e9d160da
parentafa8ecf43bd29a9e620d5e60da8e54cc440475dc (diff)
downloadkernel-399bcf0db6187b13737b483b7d516ef11e0b0d02.tar.gz
kernel-399bcf0db6187b13737b483b7d516ef11e0b0d02.tar.xz
kernel-399bcf0db6187b13737b483b7d516ef11e0b0d02.zip
move hyperv to the right config file
-rw-r--r--config-generic1
-rw-r--r--config-x86-generic3
2 files changed, 3 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index cb2685716..b09abfca5 100644
--- a/config-generic
+++ b/config-generic
@@ -4342,7 +4342,6 @@ CONFIG_USB_ATMEL=m
# CONFIG_RTL8192E is not set
# CONFIG_INPUT_GPIO is not set
# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_HYPERV is not set
# CONFIG_R8187SE is not set
# CONFIG_RTL8192U is not set
# CONFIG_BATMAN_ADV is not set
diff --git a/config-x86-generic b/config-x86-generic
index 23044c463..fec30ea87 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -381,3 +381,6 @@ CONFIG_HP_ACCEL=m
CONFIG_SCHED_SMT=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_RELOCATABLE=y
+
+# CONFIG_HYPERV is not set
+