From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 14 Dec 2006 05:09:16 +0000 (+0000)
Subject: BUILTIN -> REMOVED : CONFIG_UTRACE
X-Git-Tag: before-fedora-2_6_18-1_2255_FC5-vs2_0_3-rc1~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=477601555fa976e13e6901c5733184d680629f1b;p=linux-2.6.git

BUILTIN -> REMOVED : CONFIG_UTRACE
BUILTIN -> REMOVED : CONFIG_PTRACE
DISABLE -> REMOVED : CONFIG_X86_APIC_AUTO
BUILTIN -> REMOVED : CONFIG_VIDEO_V4L2
---

diff --git a/configs/kernel-2.6.18-i686-planetlab.config b/configs/kernel-2.6.18-i686-planetlab.config
index 3c0c86aa2..96b253d7a 100644
--- a/configs/kernel-2.6.18-i686-planetlab.config
+++ b/configs/kernel-2.6.18-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.18-1.2239_FC5.1
-# Tue Dec 12 22:48:04 2006
+# Thu Dec 14 03:29:59 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -74,12 +74,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SIG is not set
 CONFIG_KMOD=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -159,7 +153,6 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_LOCAL_APIC=y
-# CONFIG_X86_APIC_AUTO is not set
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
@@ -1205,7 +1198,6 @@ CONFIG_I2C_ALGOBIT=m
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices