[kernel] r13773 - in dists/trunk/linux-2.6/debian/config: . amd64 i386 i386/none ia64 kernelarch-x86 powerpc

Bastian Blank waldi at alioth.debian.org
Wed Jun 10 19:08:43 UTC 2009 

Author: waldi
Date: Wed Jun 10 19:08:41 2009
New Revision: 13773

Log:
debian/config: Centralize CPU Frequency scaling options.

Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/amd64/config.amd64
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/i386/none/config.486
   dists/trunk/linux-2.6/debian/config/i386/none/config.686
   dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -158,24 +158,6 @@
 CONFIG_IPMI_POWEROFF=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-## choice: Default CPUFreq governor
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-## end choice
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-##
 ## file: drivers/cpuidle/Kconfig
 ##
 CONFIG_CPU_IDLE=y

Modified: dists/trunk/linux-2.6/debian/config/amd64/config.amd64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config.amd64	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/amd64/config.amd64	Wed Jun 10 19:08:41 2009	(r13773)
@@ -4,11 +4,6 @@
 CONFIG_DIGIEPCA=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-
-##
 ## file: drivers/video/Kconfig
 ##
 CONFIG_FB_MATROX_G=y

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -250,6 +250,25 @@
 CONFIG_CONNECTOR=m
 
 ##
+## file: drivers/cpufreq/Kconfig
+##
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+## choice: Default CPUFreq governor
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+## end choice
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+##
 ## file: drivers/crypto/Kconfig
 ##
 CONFIG_CRYPTO_HW=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -177,24 +177,6 @@
 CONFIG_IPMI_POWEROFF=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-## choice: Default CPUFreq governor
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-## end choice
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-##
 ## file: drivers/cpuidle/Kconfig
 ##
 CONFIG_CPU_IDLE=y

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.486	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.486	Wed Jun 10 19:08:41 2009	(r13773)
@@ -33,11 +33,6 @@
 CONFIG_ISTALLION=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-
-##
 ## file: drivers/eisa/Kconfig
 ##
 CONFIG_EISA_VLB_PRIMING=y

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686	Wed Jun 10 19:08:41 2009	(r13773)
@@ -26,11 +26,6 @@
 # CONFIG_RIO is not set
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-
-##
 ## file: drivers/i2c/busses/Kconfig
 ##
 # CONFIG_I2C_ELEKTOR is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed Jun 10 19:08:41 2009	(r13773)
@@ -29,11 +29,6 @@
 # CONFIG_RIO is not set
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-
-##
 ## file: drivers/i2c/busses/Kconfig
 ##
 # CONFIG_I2C_ELEKTOR is not set

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -121,20 +121,6 @@
 CONFIG_IPMI_POWEROFF=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT=m
-## choice: Default CPUFreq governor
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-## end choice
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-##
 ## file: drivers/firmware/Kconfig
 ##
 CONFIG_EFI_VARS=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -141,6 +141,16 @@
 CONFIG_HVC_XEN=y
 
 ##
+## file: drivers/cpufreq/Kconfig
+##
+## choice: Default CPUFreq governor
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+## end choice
+
+##
 ## file: drivers/input/Kconfig
 ##
 CONFIG_XEN_KBDDEV_FRONTEND=y

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Jun 10 15:29:05 2009	(r13772)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Jun 10 19:08:41 2009	(r13773)
@@ -170,21 +170,7 @@
 ##
 ## file: drivers/cpufreq/Kconfig
 ##
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-## choice: Default CPUFreq governor
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-## end choice
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 ##
 ## file: drivers/gpu/drm/Kconfig

More information about the Kernel-svn-changes mailing list