[PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG

[Bjorn Helgaas]

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@xxxxxx>

Index: work/drivers/pnp/card.c
===================================================================
--- work.orig/drivers/pnp/card.c	2005-08-01 09:53:38.000000000 -0600
+++ work/drivers/pnp/card.c	2005-08-01 10:04:44.000000000 -0600
@@ -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"
 
Index: work/drivers/pnp/driver.c
===================================================================
--- work.orig/drivers/pnp/driver.c	2005-08-01 09:53:38.000000000 -0600
+++ work/drivers/pnp/driver.c	2005-08-01 10:04:44.000000000 -0600
@@ -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"
 
Index: work/drivers/pnp/manager.c
===================================================================
--- work.orig/drivers/pnp/manager.c	2005-08-01 09:53:38.000000000 -0600
+++ work/drivers/pnp/manager.c	2005-08-01 10:04:44.000000000 -0600
@@ -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"
 
Index: work/drivers/pnp/quirks.c
===================================================================
--- work.orig/drivers/pnp/quirks.c	2005-08-01 09:53:38.000000000 -0600
+++ work/drivers/pnp/quirks.c	2005-08-01 10:04:44.000000000 -0600
@@ -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"
 
Index: work/drivers/pnp/support.c
===================================================================
--- work.orig/drivers/pnp/support.c	2005-08-01 09:53:38.000000000 -0600
+++ work/drivers/pnp/support.c	2005-08-01 10:04:44.000000000 -0600
@@ -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"
 
Index: work/include/linux/pnp.h
===================================================================
--- work.orig/include/linux/pnp.h	2005-08-01 09:53:38.000000000 -0600
+++ work/include/linux/pnp.h	2005-08-01 10:04:44.000000000 -0600
@@ -443,7 +443,7 @@
 #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)
Index: work/drivers/pnp/pnpacpi/core.c
===================================================================
--- work.orig/drivers/pnp/pnpacpi/core.c	2005-08-01 10:04:44.000000000 -0600
+++ work/drivers/pnp/pnpacpi/core.c	2005-08-01 10:16:42.000000000 -0600
@@ -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>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/