diff options
author | John Rigby <john.rigby@linaro.org> | 2011-02-08 20:41:41 -0700 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:05:30 -0600 |
commit | c57f2018a8b0e9440820eabe79cad8358511f39e (patch) | |
tree | 6a0cbdab824e59546f7a8a7cf1479af3c1fe8342 | |
parent | 8806a1bf85523afa8ac8ba28718708541e296e53 (diff) |
LINARO: [Config] Enforce CONFIG_PRINTK_TIME for all flavours
Buglink: http://bugs/launchpad.net/bugs/715576
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r-- | debian.linaro/changelog | 2 | ||||
-rw-r--r-- | debian.linaro/config/armel/config.flavour.linaro-mx51 | 1 | ||||
-rw-r--r-- | debian.linaro/config/armel/config.flavour.linaro-omap | 1 | ||||
-rw-r--r-- | debian.linaro/config/armel/config.flavour.linaro-u8500 | 1 | ||||
-rw-r--r-- | debian.linaro/config/armel/config.flavour.linaro-vexpress | 1 | ||||
-rw-r--r-- | debian.linaro/config/config.common.ubuntu | 1 | ||||
-rw-r--r-- | debian.linaro/config/enforce | 2 |
7 files changed, 5 insertions, 4 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 28a43ca3b84..50d8d091d5a 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -18,6 +18,8 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low * Fix Ubuntu upstream version number typo * rebase to linaro-linux-2.6.37-upstream-31Jan2011 * rebase to linaro-linux-2.6.37-upstream-08Feb2011 + * enforce CONFIG_PRINTK_TIME for all flavours + - LP: #715576 -- 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 bf2014d5acc..8ce12e59e58 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-mx51 +++ b/debian.linaro/config/armel/config.flavour.linaro-mx51 @@ -368,7 +368,6 @@ CONFIG_PM_DEBUG=y # CONFIG_PPS is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PRINTK_TIME is not set # CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PROFILING is not set # CONFIG_QNX4FS_FS is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap index 0b16f34d1b4..3f861159475 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-omap +++ b/debian.linaro/config/armel/config.flavour.linaro-omap @@ -400,7 +400,6 @@ CONFIG_POWER_SUPPLY=y CONFIG_PPS=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PRINTK_TIME=y CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROFILING=y CONFIG_QNX4FS_FS=m diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500 index 0e5ad277a6b..abc4346f33e 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-u8500 +++ b/debian.linaro/config/armel/config.flavour.linaro-u8500 @@ -385,7 +385,6 @@ CONFIG_PM_DEBUG=y # CONFIG_PPS is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PRINTK_TIME is not set # CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PROFILING is not set # CONFIG_QNX4FS_FS is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress index 4146daa9356..08191c30c2e 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-vexpress +++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress @@ -381,7 +381,6 @@ CONFIG_OABI_COMPAT=y # CONFIG_PPS is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PRINTK_TIME is not set # CONFIG_PROFILING is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QSEMI_PHY is not set diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index c65d6b48951..8dddb6a20d4 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1923,6 +1923,7 @@ CONFIG_PPS_CLIENT_LDISC=m CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PRINTER=m CONFIG_PRINTK=y +CONFIG_PRINTK_TIME=y # CONFIG_PRISM2_USB is not set CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce index ed9b1055592..514a565ea83 100644 --- a/debian.linaro/config/enforce +++ b/debian.linaro/config/enforce @@ -73,3 +73,5 @@ value CONFIG_IMA n # Ensure CONFIG_IPV6 is y, if this is a module we get a module load for # every ipv6 packet, bad. value CONFIG_IPV6 y + +value CONFIG_PRINTK_TIME y |