X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-ppc64iseries.config;fp=configs%2Fkernel-2.6.18-ppc64iseries.config;h=726bc8d02cb4c7bd6b07f24b2bb81d7f1259d10e;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=22f751443726e688aa32b964a33c5a8c1bbae87a;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/configs/kernel-2.6.18-ppc64iseries.config b/configs/kernel-2.6.18-ppc64iseries.config
index 22f751443..726bc8d02 100644
--- a/configs/kernel-2.6.18-ppc64iseries.config
+++ b/configs/kernel-2.6.18-ppc64iseries.config
@@ -1,8 +1,8 @@
 # powerpc
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.2
-# Mon Nov 13 09:32:00 2006
+# Linux kernel version: 2.6.18.5
+# Wed Dec 13 17:11:35 2006
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -99,12 +99,6 @@ CONFIG_MODULE_SIG=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 
-#
-# Process debugging support
-#
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
 #
 # Block layer
 #
@@ -1134,7 +1128,6 @@ CONFIG_TCG_ATMEL=m
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices