Make DEBUG take precedence over DYNAMIC_PRINTK_DEBUG
authorCornelia Huck <cornelia.huck@de.ibm.com>
Thu, 4 Dec 2008 15:55:47 +0000 (16:55 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 18:44:33 +0000 (10:44 -0800)
commitd0d85ff989222f08dd1fa66321fef5567bbc4a7b
tree77af68b3dcd51d95c231025dcb3e4dd3bd21b285
parentb9daa99ee533578e3f88231e7a16784dcb44ec42
Make DEBUG take precedence over DYNAMIC_PRINTK_DEBUG

Statically defined DEBUG should take precedence over
dynamically enabled debugging; otherwise adding DEBUG
(like, for example, via CONFIG_DEBUG_KOBJECT) does not
have the expected result of printing pr_debug() and dev_dbg()
messages unconditionally.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/device.h
include/linux/kernel.h