SOURCES (LINUX_2_6): kernel-multiarch.config - fixed some redefinition prob...

[sparky]

Author: sparky                       Date: Sun Sep 28 15:59:57 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fixed some redefinition problems:
  (ppc/ppc64): CONFIG_CPU_FREQ_GOV_PERFORMANCE redefined from `m' to `y'
  (all): CONFIG_VIDEO_V4L2 redefined from `y' to `m'
  (all): CONFIG_VIDEO_V4L1 redefined from `y' to `m'
  (all): CONFIG_INFINIBAND_MTHCA_DEBUG redefined from `n' to `y'

---- Files affected:
SOURCES:
   kernel-multiarch.config (1.1.2.47 -> 1.1.2.48) 

---- Diffs:

================================================================
Index: SOURCES/kernel-multiarch.config
diff -u SOURCES/kernel-multiarch.config:1.1.2.47 SOURCES/kernel-multiarch.config:1.1.2.48
--- SOURCES/kernel-multiarch.config:1.1.2.47	Sun Sep 28 02:44:22 2008
+++ SOURCES/kernel-multiarch.config	Sun Sep 28 17:59:51 2008
@@ -511,15 +511,15 @@
 CPU_FREQ all=y
 CPU_FREQ_TABLE all=m ppc=y ppc64=y
 CPU_FREQ_DEBUG all=n
-CPU_FREQ_STAT all=m ppc=y ppc64=y
+CPU_FREQ_STAT all=m
 CPU_FREQ_STAT_DETAILS all=y
 CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y alpha=
 CPU_FREQ_DEFAULT_GOV_USERSPACE all=n alpha=
 CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n alpha=
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n alpha=
-CPU_FREQ_GOV_PERFORMANCE all=y ppc=m ppc64=m
+CPU_FREQ_GOV_PERFORMANCE all=y
 CPU_FREQ_GOV_POWERSAVE all=m
-CPU_FREQ_GOV_USERSPACE all=m ppc=y ppc64=y
+CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=m
 CPU_FREQ_GOV_CONSERVATIVE all=m
 
@@ -930,7 +930,8 @@
 #- *** FILE: drivers/infiniband/hw/mthca/Kconfig ***
 #-
 INFINIBAND_MTHCA all=m sparc=
-INFINIBAND_MTHCA_DEBUG all=n sparc=
+#* DEBUG can be tured off only if EMBEDDED=y
+INFINIBAND_MTHCA_DEBUG all=y
 
 #-
 #- *** FILE: drivers/infiniband/hw/nes/Kconfig ***
@@ -1499,8 +1500,8 @@
 #-
 #- *** FILE: drivers/media/video/Kconfig ***
 #-
-VIDEO_V4L2 all=y
-VIDEO_V4L1 all=y
+VIDEO_V4L2 all=m
+VIDEO_V4L1 all=m
 VIDEO_BTCX all=m sparc=
 VIDEO_IR all=m sparc=
 VIDEO_TVEEPROM all=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-multiarch.config?r1=1.1.2.47&r2=1.1.2.48&f=u