diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2005-09-06 15:17:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:25 -0700 |
| commit | e139aa595c5d3bd01699530cbe017dec75fdb07f (patch) | |
| tree | 03d4552ed05450b49269c2b2d437bb069c603eba | |
| parent | 486d46aefe7ded0d343e306be740edd972aff740 (diff) | |
| download | talos-obmc-linux-e139aa595c5d3bd01699530cbe017dec75fdb07f.tar.gz talos-obmc-linux-e139aa595c5d3bd01699530cbe017dec75fdb07f.zip | |
[PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG
Seems pointless to require .c files to test CONFIG_PNP_DEBUG and
conditionally define DEBUG before including <linux/pnp.h>. Just test
CONFIG_PNP_DEBUG directly in pnp.h.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/pnp/card.c | 7 | ||||
| -rw-r--r-- | drivers/pnp/driver.c | 7 | ||||
| -rw-r--r-- | drivers/pnp/manager.c | 7 | ||||
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 1 | ||||
| -rw-r--r-- | drivers/pnp/quirks.c | 7 | ||||
| -rw-r--r-- | drivers/pnp/support.c | 7 | ||||
| -rw-r--r-- | include/linux/pnp.h | 2 |
7 files changed, 2 insertions, 36 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 6e5229e92fbc..e95ed67d4f05 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -8,13 +8,6 @@ #include <linux/config.h> #include <linux/module.h> #include <linux/slab.h> - -#ifdef CONFIG_PNP_DEBUG - #define DEBUG -#else - #undef DEBUG -#endif - #include <linux/pnp.h> #include "base.h" diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index 1d037c2a82ac..33da25f3213f 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c @@ -11,13 +11,6 @@ #include <linux/module.h> #include <linux/ctype.h> #include <linux/slab.h> - -#ifdef CONFIG_PNP_DEBUG - #define DEBUG -#else - #undef DEBUG -#endif - #include <linux/pnp.h> #include "base.h" diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 6c510c19ad7d..94442ffd4aed 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c @@ -11,13 +11,6 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> - -#ifdef CONFIG_PNP_DEBUG - #define DEBUG -#else - #undef DEBUG -#endif - #include <linux/pnp.h> #include "base.h" diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index d3d292ea5876..1a8915e74160 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/config.h> #include <linux/acpi.h> #include <linux/pnp.h> #include <acpi/acpi_bus.h> diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index 596a02d7e03d..8936b0cb2ec3 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -16,13 +16,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/slab.h> - -#ifdef CONFIG_PNP_DEBUG - #define DEBUG -#else - #undef DEBUG -#endif - #include <linux/pnp.h> #include "base.h" diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c index b952aec49189..61fe998944bd 100644 --- a/drivers/pnp/support.c +++ b/drivers/pnp/support.c @@ -8,13 +8,6 @@ #include <linux/config.h> #include <linux/module.h> #include <linux/ctype.h> - -#ifdef CONFIG_PNP_DEBUG - #define DEBUG -#else - #undef DEBUG -#endif - #include <linux/pnp.h> #include "base.h" diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 5ec2bd0c2848..aadbac29103c 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -443,7 +443,7 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { ; } #define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg) #define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg) -#ifdef DEBUG +#ifdef CONFIG_PNP_DEBUG #define pnp_dbg(format, arg...) printk(KERN_DEBUG "pnp: " format "\n" , ## arg) #else #define pnp_dbg(format, arg...) do {} while (0) |
