LINARO: [Config] Enforce CONFIG_PM_DEBUG for all flavours

Buglink: http://bugs/launchpad.net/bugs/713075

Signed-off-by: John Rigby <john.rigby@linaro.org>

7 files changed, 8 insertions, 14 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index bde62e784de2..3f6f42a7251c 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -22,6 +22,8 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low
     - LP: #715576
   * fix package control file to indicate that OMAP4 is supported
     - LP: #714590
+  * enforce CONFIG_PM_DEBUG for all flavours
+    - LP: #713075
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 08 Feb 2011 19:56:22 -0700
 
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 8ce12e59e582..30464bad7894 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -145,7 +145,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FONTS is not set
-CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -362,8 +361,6 @@ CONFIG_NO_HZ=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
 # CONFIG_PREEMPT_NONE is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 3f8611594750..c1301b80e0d6 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -158,7 +158,6 @@ CONFIG_FB_SM7XX=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
-CONFIG_FREEZER=y
 CONFIG_FSCACHE=m
 CONFIG_FTL=m
 CONFIG_FTRACE=y
@@ -195,7 +194,6 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HOTPLUG_CPU=y
 CONFIG_HPFS_FS=m
 CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
@@ -393,8 +391,6 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_PHONE=m
 CONFIG_PHONET=m
 CONFIG_PID_NS=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
 CONFIG_POHMELFS=m
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index abc4346f33e4..b0c2a2685a91 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -154,7 +154,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_SM7XX is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FONTS is not set
-CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -190,7 +189,6 @@ CONFIG_GPIOLIB=y
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HOTPLUG_CPU=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_HWMON is not set
 CONFIG_HW_RANDOM=y
@@ -378,8 +376,6 @@ CONFIG_NR_CPUS=2
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
 # CONFIG_POHMELFS is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 08191c30c2ef..7c9d312e1879 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -151,7 +151,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FIXED_PHY is not set
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
-# CONFIG_FREEZER is not set
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -187,7 +186,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_HID_ZYDACRON is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HOTPLUG_CPU is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HWMON is not set
 # CONFIG_HW_RANDOM is not set
@@ -376,7 +374,6 @@ CONFIG_OABI_COMPAT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
-# CONFIG_PM is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
 CONFIG_PREEMPT_NONE=y
@@ -508,6 +505,7 @@ CONFIG_USB_ISP1760_HCD=y
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USB_MON=y
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 8dddb6a20d4b..9b35afc80625 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -750,6 +750,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
+CONFIG_FREEZER=y
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_FSCACHE_HISTOGRAM=y
 # CONFIG_FSCACHE_OBJECT_LIST is not set
@@ -912,6 +913,7 @@ CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOTPLUG=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
@@ -1888,9 +1890,11 @@ CONFIG_PLAT_NOMADIK=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
+CONFIG_PM=y
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_DEBUG=y
 CONFIG_PM_OPP=y
 CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index 514a565ea839..c7c4562ba35b 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -75,3 +75,4 @@ value CONFIG_IMA n
 value CONFIG_IPV6 y
 
 value CONFIG_PRINTK_TIME y
+value CONFIG_PM_DEBUG y