]> git.hungrycats.org Git - linux/commitdiff
zygo: make oldconfig for 2.6.35.14-zb5s zygo-2.6.35.14-zb5s
authorZygo Blaxell <zblaxell@satsuki.furryterror.org>
Sat, 13 Aug 2011 02:45:27 +0000 (22:45 -0400)
committerZygo Blaxell <zblaxell@satsuki.furryterror.org>
Sat, 13 Aug 2011 02:45:27 +0000 (22:45 -0400)
drop non-building CONFIG_HYPERV_NET

pick up IRQ accounting

.config

diff --git a/.config b/.config
index addc1800ccc794824949ef2ce86a9d2cb106bee3..1cec39069e846af3b4929bdd105a198f98efb269 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.9-zb5s
+# Linux kernel version: 2.6.35.14-zb5s
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -351,6 +351,7 @@ CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -4873,7 +4874,7 @@ CONFIG_FB_UDL=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
+# CONFIG_HYPERV_NET is not set
 CONFIG_HYPERV_UTILS=m
 CONFIG_VME_BUS=m