[PATCH 2/5] UBUNTU: [Config] CPU_IDLE_MULTIPLE_DRIVERS=y, CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |    3 +++
 debian.master/config/armhf/config.common.armhf |    3 +++
 debian.master/config/config.common.ubuntu      |    3 ---
 debian.master/config/i386/config.common.i386   |    3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 47c6d22..815f1e7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -12,6 +12,9 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ASYNC_TX_DMA is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_BCH=m
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DM_RAID45=m
 CONFIG_EDAC_MM_EDAC=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index a466b55..be7ca03 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -7,6 +7,9 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_BCH=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DM_RAID45 is not set
 CONFIG_EDAC_MM_EDAC=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6ec7ab0..e2e3232 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1088,8 +1088,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_COMMON=y
@@ -1108,7 +1106,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_CALXEDA=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PM=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index bee6613..1b08238 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -11,6 +11,9 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BCH=m
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DM_RAID45=m
 CONFIG_EDAC_MM_EDAC=m
-- 
1.7.10.4